]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/5' of git://gitorious.org/social/mainline into...
authorpostblue <postblue+git@postblue.info>
Thu, 25 Sep 2014 22:06:13 +0000 (00:06 +0200)
committerpostblue <postblue+git@postblue.info>
Thu, 25 Sep 2014 22:06:13 +0000 (00:06 +0200)

Trivial merge