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)
commit8ffecae9c63d8d5a533f3d1610d36f93ba21c2fc
treec6cd5843277dff1447ae4ad50ba73522f292b54e
parent1f890f03c885ce0761be80e69e678cce5f9ee46a
parentcd7cd0ead48ddb8d64044d15d45a68ffbe3471cf
Merge branch 'master' of https://git.gnu.io/aroque/gnu-social into social-master