]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:+socialites/statusnet/gnu-social
authorIan Denhardt <ian@zenhack.net>
Mon, 9 Aug 2010 19:53:21 +0000 (15:53 -0400)
committerIan Denhardt <ian@zenhack.net>
Mon, 9 Aug 2010 19:53:21 +0000 (15:53 -0400)

Trivial merge