From: zottel <github@zottel.net>
Date: Mon, 14 May 2012 11:59:37 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=584b15aaecbf6f58cda2031908f0319c6dfc0700;p=friendica.git

Merge remote branch 'upstream/master'
---

584b15aaecbf6f58cda2031908f0319c6dfc0700