]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 13:59:46 +0000 (09:59 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 13:59:46 +0000 (09:59 -0400)

Trivial merge