Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Fri, 16 Sep 2011 19:27:00 +0000 (15:27 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 16 Sep 2011 19:27:00 +0000 (15:27 -0400)
commit0573c268d0b2bc645fc8416a5902b363aee35f2c
tree58ca947c45b81e084dd1dead9d4f14b763c3c96e
parent9f6adb3f52890a9d4215aaca501d95320a20f252
parentdcbf2f6871de7cd26815334b6977792e2b2f31df
Merge branch '1.0.x' into testing