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

Merge remote branch 'upstream/master'
---

315d496290747aab8b3147dc24b822460071bb2d