]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 21:00:49 +0000 (17:00 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 21:00:49 +0000 (17:00 -0400)

Trivial merge