From: Michael <ike@pirati.ca>
Date: Sun, 4 Nov 2012 08:59:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=84fc86697625a074e7e6a5655e5edd365ac8f9df;p=friendica.git

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

84fc86697625a074e7e6a5655e5edd365ac8f9df