From: zottel <github@zottel.net>
Date: Wed, 16 May 2012 23:24:37 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=764ac240a9a9ffb7c855a69bc2f81e9d314a617f;p=friendica.git

Merge remote branch 'upstream/master'
---

764ac240a9a9ffb7c855a69bc2f81e9d314a617f