]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social
authorabjectio <abjectio@kollektivet0x242.no>
Sat, 30 May 2015 15:21:52 +0000 (17:21 +0200)
committerabjectio <abjectio@kollektivet0x242.no>
Sat, 30 May 2015 15:21:52 +0000 (17:21 +0200)

Trivial merge