Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 1 Sep 2011 15:30:24 +0000 (11:30 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 1 Sep 2011 15:30:24 +0000 (11:30 -0400)
commitdbc6d607ce08a0dc4fcd2931b31ab66589d15878
treebf45726c9e1d2901f8ff731bfceca872e6fa593f
parentb53391e500abef00dcf6728eb367a10e5fb8478c
parent5f441842be6868d8fed156896da387466a5d7ec0
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x