Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 03:30:24 +0000 (23:30 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 03:30:24 +0000 (23:30 -0400)
commit7d878b7c35e291e40202d7ac4c60aaf9114dac94
treea11c07e4984142cc03a6622bee823a8ba5f5d7fb
parent6c14235d6c3359a6c9012ec49077f8defe117779
parent3010429579fccbcf827652557246263412317e95
Merge branch 'testing' into 0.9.x