Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Mon, 22 Feb 2010 02:39:50 +0000 (21:39 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 22 Feb 2010 02:39:50 +0000 (21:39 -0500)
commit273c0e036347891570a02502715345f5bbb7b143
tree489c1a254e4698443e30032b0a37226259b9c958
parent912814fb7f3580e6925b5fae7092966df9bf3aab
parentca2a88545d353f0e887f48fe0e3bd43b505031ca
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing