From: Michael Vogel <icarus@dabo.de>
Date: Thu, 7 Mar 2013 19:20:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e200040c5b43b18144681a2479e55342fda16521;p=friendica.git

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

e200040c5b43b18144681a2479e55342fda16521