]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 21 Mar 2016 02:21:51 +0000 (03:21 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 21 Mar 2016 02:21:51 +0000 (03:21 +0100)

Trivial merge