From: Michael Vogel <icarus@dabo.de>
Date: Thu, 29 May 2014 21:04:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=13fea42d8cb9c9fb479f5965b842ae5f7cf484f0;p=friendica.git

Merge remote-tracking branch 'upstream/master'
---

13fea42d8cb9c9fb479f5965b842ae5f7cf484f0