]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Fri, 10 Jul 2015 14:02:55 +0000 (16:02 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Fri, 10 Jul 2015 14:02:55 +0000 (16:02 +0200)

Trivial merge