From: Michael <icarus@dabo.de>
Date: Sat, 26 May 2012 09:59:54 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=47abeb00ecf763aa66380efa5db3a0ed40941ffd;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

47abeb00ecf763aa66380efa5db3a0ed40941ffd