From: Thomas <rat@rlyeh-military-affairs>
Date: Tue, 20 Mar 2012 16:40:05 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=772686b171e7af4768e206f4420dbcd8c9392c7f;p=friendica-addons.git

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

772686b171e7af4768e206f4420dbcd8c9392c7f