]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly' of gitorious.org:social/mainline into nightly postblue-nightly
authorpostblue <postblue+git@postblue.info>
Sat, 7 Mar 2015 23:35:02 +0000 (00:35 +0100)
committerpostblue <postblue+git@postblue.info>
Sat, 7 Mar 2015 23:35:02 +0000 (00:35 +0100)

Trivial merge