]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:social/mainline into social-master
authorRoland Häder <haeder@hmmdeutschland.de>
Fri, 16 Jan 2015 11:58:23 +0000 (12:58 +0100)
committerRoland Häder <haeder@hmmdeutschland.de>
Fri, 16 Jan 2015 11:58:26 +0000 (12:58 +0100)
Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>

Trivial merge