Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 03:41:56 +0000 (23:41 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 03:41:56 +0000 (23:41 -0400)
commitedf45ad6470d8811f7e96e58420ece8b5fc8c70c
treec1cccff38bb1b499f24a4a24ea10ae38eb72ef9b
parent7d878b7c35e291e40202d7ac4c60aaf9114dac94
parentcc6e4c93e5085b21b7f7b5cbdecc42ffc470ffae
Merge branch 'testing' into 0.9.x