]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'upstream/nightly' into nightly
authorpostblue <postblue+git@postblue.info>
Tue, 13 Jan 2015 21:46:16 +0000 (22:46 +0100)
committerpostblue <postblue+git@postblue.info>
Tue, 13 Jan 2015 21:46:16 +0000 (22:46 +0100)

Trivial merge