Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Sun, 21 Feb 2010 22:44:28 +0000 (14:44 -0800)
committerZach Copley <zach@status.net>
Sun, 21 Feb 2010 22:44:28 +0000 (14:44 -0800)
commitca2a88545d353f0e887f48fe0e3bd43b505031ca
treee8b0d4ef406ce49a8df1991dc5d2abba14179111
parent10281d59f4bf8298ff65792d1a7826913d96fafa
parentaa0b2ce81ad4a99fb55a36feda54e70bcd0808be
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing