Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 4 May 2011 21:46:36 +0000 (14:46 -0700)
committerEvan Prodromou <evan@status.net>
Wed, 4 May 2011 21:46:36 +0000 (14:46 -0700)
commit753bc7302a608e089d87abbc19535b845b226992
tree91eadefe2483ced9f6e748fe96a61c070902a129
parent83397e28b8459962ae291a45e6c566bccb93a454
parentd8151311ee3aa4e69e7910e97687da9d5def3970
Merge branch 'master' into 0.9.x