Merge branch '0.9.x'
authorEvan Prodromou <evan@status.net>
Sat, 30 Jul 2011 11:49:05 +0000 (07:49 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 30 Jul 2011 11:49:05 +0000 (07:49 -0400)
commitafd42611a3c5dc2366123ac5cfdcadec1a7ea373
tree5b8094282fa5931c3fb0d1a1c4fc41c5673d14f4
parentbe376b3b608703454ef80c4d824f418af2db4438
parent5517741909f88b42133062e622a556540b61526d
Merge branch '0.9.x'