From: Michael Vogel <icarus@dabo.de>
Date: Mon, 23 May 2016 04:49:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=39ce0231589b7fffeb501c50d23eb52ca601ebed;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon
---

39ce0231589b7fffeb501c50d23eb52ca601ebed