]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly'
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 5 Sep 2015 23:54:00 +0000 (01:54 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 5 Sep 2015 23:54:00 +0000 (01:54 +0200)

Trivial merge