From: Michael <icarus@dabo.de>
Date: Mon, 18 Jun 2012 06:48:33 +0000 (+0200)
Subject: Merge branch 'master' of github.com:annando/friendica-addons
X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=commitdiff_plain;h=182951f4eee76fbf793285fc349d70ec78dfa915

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

182951f4eee76fbf793285fc349d70ec78dfa915