Merge branch 'master' of gitorious.org:statusnet-client/statusnet-client
authorZach Copley <zach@status.net>
Fri, 27 Aug 2010 23:00:45 +0000 (16:00 -0700)
committerZach Copley <zach@status.net>
Fri, 27 Aug 2010 23:00:45 +0000 (16:00 -0700)
commit066ec1fa1b96b954871def0b94d9792820f04499
tree27cc0f780e83df2459f58b1a155fdf4338366c60
parentebc7431354b86765f54c9fd5297cb8eda715c6d5
parent62c847838783f0af771b28bd69c736c0eddcf997
Merge branch 'master' of gitorious.org:statusnet-client/statusnet-client