Merge branch 'master' of gitorious.org:statusnet-client/statusnet-client
authorBrion Vibber <brion@pobox.com>
Sat, 28 Aug 2010 00:06:42 +0000 (17:06 -0700)
committerBrion Vibber <brion@pobox.com>
Sat, 28 Aug 2010 00:06:42 +0000 (17:06 -0700)
commit787b6aa1f23bb3f0b1e9709589b02468eca7c260
tree3301b5437419551e8a7b6eabde3bfe19c6110f52
parent31345f70ffaa78d2a417db7d77aa3969ddd146cb
parent066ec1fa1b96b954871def0b94d9792820f04499
Merge branch 'master' of gitorious.org:statusnet-client/statusnet-client