Merge branch 'master' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 21:11:41 +0000 (13:11 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 21:11:41 +0000 (13:11 -0800)
commited8553eea8b308ae0e686fdf96d3e209e83be28c
tree671d63d16eca6d9c878d88a18c8aeaf66286f6ed
parenta020e230860358fc8b63cd56872bbad0446016e0
parent239b88025ef1368bb871871ee903d6b078493f76
Merge branch 'master' of gitorious.org:statusnet/mainline into testing