From: zottel <github@zottel.net>
Date: Sat, 2 Jun 2012 00:37:20 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=df2fdf08ddf8cb354022992d4353ced4295b77b3;p=friendica.git

Merge remote branch 'upstream/master'
---

df2fdf08ddf8cb354022992d4353ced4295b77b3