Merge remote-tracking branch 'origin/0.9.x' into 0.9.x 0.9.x
authorEvan Prodromou <evan@status.net>
Thu, 8 Sep 2011 13:01:43 +0000 (09:01 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 8 Sep 2011 13:01:43 +0000 (09:01 -0400)
commite0e0ce2bcd7c6c4d97a7dba9e2c36e1cde5d7b9b
tree415b17346f892dbf6a3735731748e93bffd49df6
parente05800c023446bfadec817d2da367e7721abb648
parentafd42611a3c5dc2366123ac5cfdcadec1a7ea373
Merge remote-tracking branch 'origin/0.9.x' into 0.9.x