From: Zered <zered.free@free.fr>
Date: Fri, 2 Aug 2013 17:59:13 +0000 (-0700)
Subject: Merge pull request #2 from friendica/master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1285cb28289faa274c14e9966b892cec586c6abe;p=friendica.git

Merge pull request #2 from friendica/master

Update zered's repo
---

1285cb28289faa274c14e9966b892cec586c6abe