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

Merge remote branch 'upstream/master'
---

5fadf68fb4e4a6e0fde6fbf82ad7600c8ca12c04