From: hauke <hauke@grlg.org>
Date: Sun, 7 Sep 2014 10:51:39 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5633e88aadc5731239430febe6b0799083d3729e;p=friendica.git

Merge branch 'master' of https://github.com/friendica/friendica
---

5633e88aadc5731239430febe6b0799083d3729e