Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 6 Sep 2010 14:11:59 +0000 (10:11 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 6 Sep 2010 14:11:59 +0000 (10:11 -0400)
commit80044ad735643c289c6f682f60e67bb7662bde0f
tree531b1e0ba08b977130aacede32745321e404024b
parent5d3136726a8fd518db26614523459e50dc53368d
parent58b5ff718a5fa209dce5dd23d6d0fb35d30facd6
Merge branch 'testing' into 0.9.x