From: Michael Vogel <icarus@dabo.de>
Date: Thu, 8 Nov 2012 20:45:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ed5dfcc4dc91514c0c19d1cdd919bae59f126811;p=friendica-addons.git

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

ed5dfcc4dc91514c0c19d1cdd919bae59f126811