]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorpostblue <postblue+git@postblue.info>
Sun, 26 Oct 2014 18:44:23 +0000 (19:44 +0100)
committerpostblue <postblue+git@postblue.info>
Sun, 26 Oct 2014 18:44:23 +0000 (19:44 +0100)

Trivial merge