Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Thu, 7 Apr 2011 02:52:14 +0000 (22:52 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 7 Apr 2011 02:52:14 +0000 (22:52 -0400)
commit68b1c057056a5db7601683383f7e466031d336bc
tree801b99b75f5bc825875596609c3aa84a7d2ae61b
parenta2782523d75d73ad833a6e0440c60f3bcb647d33
parentfa8592f50be74c84f8db5750513ee3914bf105e0
Merge branch '1.0.x' into testing