From: aroquen <aroquen@sfr.fr>
Date: Sun, 7 Jun 2015 10:59:57 +0000 (+0200)
Subject: Merge branch 'master' of git.gnu.io:aroque/gnu-social
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cd7cd0ead48ddb8d64044d15d45a68ffbe3471cf;p=quix0rs-gnu-social.git

Merge branch 'master' of git.gnu.io:aroque/gnu-social
---

cd7cd0ead48ddb8d64044d15d45a68ffbe3471cf