From: zottel <github@zottel.net>
Date: Fri, 4 May 2012 08:00:04 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a9f825ec3fc8b44115b1fae3b1aeb2c07f23e3de;p=friendica.git

Merge remote branch 'upstream/master'
---

a9f825ec3fc8b44115b1fae3b1aeb2c07f23e3de