]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Mon, 28 Sep 2009 01:58:06 +0000 (21:58 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 28 Sep 2009 01:58:06 +0000 (21:58 -0400)

Trivial merge