Merge branch 'master' of gitorious.org:statusnet-client/statusnet-client
authorBrion Vibber <brion@pobox.com>
Thu, 26 Aug 2010 00:17:44 +0000 (17:17 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 26 Aug 2010 00:17:44 +0000 (17:17 -0700)
commite125c3cc7bbff908e99909b2af9e8bc50e4397d3
treeb9196696b3aaa4414a597d101d7ee0aa5dd12aee
parent1c8d9d2c0b588104bd2e3b58864212024b815294
parent71426ea34bcbe6bcaadd9e300ff35ffa318ff77d
Merge branch 'master' of gitorious.org:statusnet-client/statusnet-client