]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
authorabjectio <abjectio@kollektivet0x242.no>
Sat, 6 Jun 2015 21:32:10 +0000 (23:32 +0200)
committerabjectio <abjectio@kollektivet0x242.no>
Sat, 6 Jun 2015 21:32:10 +0000 (23:32 +0200)

Trivial merge