Merge branch 'master' of https://git.gnu.io/aroque/gnu-social into social-master
authorRoland Haeder <roland@mxchange.org>
Sat, 13 Jun 2015 10:02:30 +0000 (12:02 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 13 Jun 2015 10:02:30 +0000 (12:02 +0200)

Trivial merge