Merge branch 'master' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Mon, 22 Feb 2010 02:56:41 +0000 (18:56 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 22 Feb 2010 02:56:41 +0000 (18:56 -0800)
commit3c61f45de1226b22eeb83bd1f6db01984f953737
treeffb7bf7cb134b5072a409bd10331eacfb11dd44b
parentd3996996e483bc8ee1b4c9a38bc3ad17baabb8c0
parentf6ebe815382a61574df5f9452ee9a0ea4ae38f0c
Merge branch 'master' of gitorious.org:statusnet/mainline into testing