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

Trivial merge