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

Merge remote branch 'upstream/master'
---

d92be9d93cc6a9b90572cd46e982e24f57c43ffc