From: hauke <hauke@grlg.org>
Date: Wed, 13 May 2015 18:55:59 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica-addons
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0e5e456e209cf3ea2dbeaa51af37b77abee4ced8;p=friendica-addons.git

Merge branch 'master' of https://github.com/friendica/friendica-addons
---

0e5e456e209cf3ea2dbeaa51af37b77abee4ced8