From: Michael Vogel <icarus@dabo.de>
Date: Sun, 30 Aug 2015 08:44:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cc3419f1016d2adc41996c077143bf872ace2383;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu

Conflicts:
	mod/dfrn_notify.php
---

cc3419f1016d2adc41996c077143bf872ace2383