Merge branch 'testing' of git@gitorious.org:statusnet/mainline into ostatus-testing
authorBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 20:19:24 +0000 (12:19 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 20:19:24 +0000 (12:19 -0800)
commit04ebf2b6c48dcb0975c2cf054c9d7d996a6d1253
tree41211894ec8e6385d91733f449118ac6a0ea5863
parent1d69bf94c3f7c89a7ffcfceaf2099031843a15d2
parent5bdc6fa5d456c3f520d8124950684220d8f440a3
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into ostatus-testing