]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'upstream/master' into nightly
authorwww-data <www-data@mail.gnusocial.de>
Wed, 27 Apr 2016 13:16:26 +0000 (15:16 +0200)
committerwww-data <www-data@mail.gnusocial.de>
Wed, 27 Apr 2016 13:16:26 +0000 (15:16 +0200)

Trivial merge