Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Wed, 7 Sep 2011 15:22:08 +0000 (11:22 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 7 Sep 2011 15:22:08 +0000 (11:22 -0400)
commit524cabe2c77cbcb765c7f6347928b9826f3cfd1a
tree7877efb5e416ffbec43d081fbf27db5fae1c2fd7
parentdbc6d607ce08a0dc4fcd2931b31ab66589d15878
parent0db83327defb41cec66590ca4a4fe6aa0982da2c
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x