]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Mon, 8 Mar 2010 04:42:46 +0000 (23:42 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 8 Mar 2010 04:42:46 +0000 (23:42 -0500)

Trivial merge