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

Trivial merge