From: Michael Vogel <icarus@dabo.de>
Date: Sun, 15 Jul 2012 15:24:41 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c460ff6348fc2f3944f8eb4e7af1d74cba06c236;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

c460ff6348fc2f3944f8eb4e7af1d74cba06c236