]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly' of gitorious.org:social/quix0rs-gnu-social into nightly
authorRoland Häder <haeder@hmmdeutschland.de>
Thu, 22 Jan 2015 12:37:29 +0000 (13:37 +0100)
committerRoland Häder <haeder@hmmdeutschland.de>
Thu, 22 Jan 2015 12:37:34 +0000 (13:37 +0100)
Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>

Trivial merge