Merge branch '1.0.x'
authorEvan Prodromou <evan@status.net>
Thu, 20 Oct 2011 14:54:41 +0000 (10:54 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 20 Oct 2011 14:54:41 +0000 (10:54 -0400)
commitba3f6b2db9754e9eba9a7ecb7560805de74676c6
treebfe6f465b04a3040cc31228b3a639f269efbdbe0
parent6a6ac58fafc07c8fd2d887710ad5e34c3fe530d8
parentb8079549cedbe0aa1f60e48c77ec1fc195731609
Merge branch '1.0.x'