]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorpostblue <postblue+git@postblue.info>
Thu, 5 Mar 2015 13:16:02 +0000 (14:16 +0100)
committerpostblue <postblue+git@postblue.info>
Thu, 5 Mar 2015 13:16:02 +0000 (14:16 +0100)

Trivial merge