From: zottel <github@zottel.net>
Date: Fri, 20 Apr 2012 11:42:33 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9663299da1be50eef4327778fae619fc6f9edef4;p=friendica.git

Merge remote branch 'upstream/master'
---

9663299da1be50eef4327778fae619fc6f9edef4