From: Michael Vogel <icarus@dabo.de>
Date: Fri, 27 Sep 2013 21:38:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6d0e1ccf407f6eac8800533e6e562b9633540b6b;p=friendica-addons.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	pumpio/pumpio.php
---

6d0e1ccf407f6eac8800533e6e562b9633540b6b