]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorpostblue <postblue+git@postblue.info>
Thu, 27 Nov 2014 16:54:11 +0000 (17:54 +0100)
committerpostblue <postblue+git@postblue.info>
Thu, 27 Nov 2014 16:54:11 +0000 (17:54 +0100)

Trivial merge