Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master
authorRoland Haeder <roland@mxchange.org>
Fri, 29 May 2015 16:33:06 +0000 (18:33 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 29 May 2015 16:36:01 +0000 (18:36 +0200)
commitaa6da5965da099e6c029a62a96a3b13d9448da4d
tree39728f93b53e1d1e338374c74398d91a89d9e9ca
parentd9b35208ecda59292680fb55e38c56b2831d5366
parentf926e27a652fa2a82241b2bbe2216b505d900465
Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>