]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorpostblue <postblue+git@postblue.info>
Wed, 1 Oct 2014 11:09:14 +0000 (13:09 +0200)
committerpostblue <postblue+git@postblue.info>
Wed, 1 Oct 2014 11:09:14 +0000 (13:09 +0200)

Trivial merge