From: Michael <heluecht@pirati.ca>
Date: Mon, 13 Mar 2017 10:21:35 +0000 (+0000)
Subject: Merge branch 'master' of github.com:annando/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f852f7aac0b44f243d3cd812aa92122f7b38067b;p=friendica.git

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

f852f7aac0b44f243d3cd812aa92122f7b38067b