From: root <root@pirati.ca>
Date: Sun, 4 Nov 2012 22:31:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fe3f1af92fb2e0b30a5089e0eabcada5a19fff32;p=friendica.git

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

fe3f1af92fb2e0b30a5089e0eabcada5a19fff32