]> 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>
Sun, 15 Jan 2017 20:25:06 +0000 (21:25 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sun, 15 Jan 2017 20:25:06 +0000 (21:25 +0100)

Trivial merge