]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'upstream/nightly' into nightly
authorpostblue <postblue+git@postblue.info>
Sat, 10 Jan 2015 19:38:12 +0000 (20:38 +0100)
committerpostblue <postblue+git@postblue.info>
Sat, 10 Jan 2015 19:38:12 +0000 (20:38 +0100)

Trivial merge