Merge branch 'testing' of git@gitorious.org:statusnet/mainline into ostatus-testing
authorBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 20:21:33 +0000 (12:21 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 20:21:33 +0000 (12:21 -0800)
commita6b2ccdae217132a3218639b856d5e63f8a66d2e
tree232f4294647ca0aaaab8d3672f60565cdb83d10d
parent04ebf2b6c48dcb0975c2cf054c9d7d996a6d1253
parenta020e230860358fc8b63cd56872bbad0446016e0
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into ostatus-testing