]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorpostblue <postblue+git@postblue.info>
Fri, 27 Feb 2015 19:21:47 +0000 (20:21 +0100)
committerpostblue <postblue+git@postblue.info>
Fri, 27 Feb 2015 19:21:47 +0000 (20:21 +0100)

Trivial merge