]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:social/mainline sazius-nightly
authorMatt Lee <mattl@creativecommons.org>
Tue, 19 Aug 2014 03:42:56 +0000 (23:42 -0400)
committerMatt Lee <mattl@creativecommons.org>
Tue, 19 Aug 2014 03:42:56 +0000 (23:42 -0400)

Trivial merge