Merge branch 'master' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 19:56:07 +0000 (11:56 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 19:56:07 +0000 (11:56 -0800)
commita020e230860358fc8b63cd56872bbad0446016e0
treeca2788c034526d53424079004ba6a726485a1e25
parent5bdc6fa5d456c3f520d8124950684220d8f440a3
parent5a1cbdc6f1e32be7b8430924a1125422d8457584
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
classes/statusnet.ini