From: zottel <github@zottel.net>
Date: Sun, 8 Apr 2012 08:33:32 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b;p=friendica.git

Merge remote branch 'upstream/master'
---

aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b