]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Thu, 3 Jun 2010 18:50:52 +0000 (14:50 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 3 Jun 2010 18:50:52 +0000 (14:50 -0400)

Trivial merge