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

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

5ff7a555dae6d69335dd7279867854506589107f