From: zottel <github@zottel.net>
Date: Wed, 21 Mar 2012 07:08:23 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e;p=friendica.git

Merge remote branch 'upstream/master'
---

88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e