Merge branch 'testing'
authorEvan Prodromou <evan@status.net>
Tue, 20 Sep 2011 15:08:27 +0000 (11:08 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 20 Sep 2011 15:08:27 +0000 (11:08 -0400)
commit31d056029461c5f61e0667ab6f80c21a505e36cc
treebaf2caef99af94096a191a8592f6fcdb20acd6cd
parentbd33036fae4ec9e1e77328c4fef56b927005d74f
parent4f01bcaf52dd559f0cb7e5c2504c10bfbb102901
Merge branch 'testing'