]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 14 Dec 2015 21:11:26 +0000 (22:11 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 14 Dec 2015 21:11:26 +0000 (22:11 +0100)

Trivial merge