From: Michael Vogel <icarus@dabo.de>
Date: Sat, 19 May 2012 12:04:24 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9a940786c18c1c2bd772aec93f1828f67dc45667;p=friendica.git

Merge remote branch 'upstream/master'
---

9a940786c18c1c2bd772aec93f1828f67dc45667