Merge branch '1.0.x'
authorEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:49:09 +0000 (15:49 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:49:09 +0000 (15:49 -0400)
commit36d724cf03f5c0a29c9a30c2fb51d631a7f1edba
tree8e7b03ccea2614d3ec9f1fc217968c7c0cfdcb69
parent347ba8c4a3fdcd4f93cde27ecec21c8f68fd4425
parentb2c5b9de52ba4c3dac7d557978d27186dee01312
Merge branch '1.0.x'