From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 22 Mar 2015 09:21:57 +0000 (+0100)
Subject: Merge branch 'develop' of github.com:friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=86c442f15b66bc06141b9f84f7de0eb788040195;p=friendica.git

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

86c442f15b66bc06141b9f84f7de0eb788040195