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

Trivial merge