]> 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>
Tue, 23 Feb 2016 20:13:58 +0000 (21:13 +0100)
committerabjectio <abjectio@kollektivet0x242.no>
Tue, 23 Feb 2016 20:13:58 +0000 (21:13 +0100)

Trivial merge