From: Michael Vogel <icarus@dabo.de>
Date: Sat, 18 May 2013 18:52:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5ef6bdf88a7fc3e816ccc3c0894c8adcf86697df;p=friendica.git

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

5ef6bdf88a7fc3e816ccc3c0894c8adcf86697df