]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into mmn_fixes
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 18 Apr 2016 14:10:50 +0000 (16:10 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 18 Apr 2016 14:10:50 +0000 (16:10 +0200)

Trivial merge