From: hauke <hauke@grlg.org>
Date: Sat, 27 Dec 2014 11:50:24 +0000 (+0100)
Subject: Merge branch 'develop' of https://github.com/friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=395be3dcde55d16c8e23dbe9137d1279b58442a4;hp=-c;p=friendica.git

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

395be3dcde55d16c8e23dbe9137d1279b58442a4