From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Oct 2015 03:11:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=48309a25eccbd15ec02a62bda116c721859b53fe;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu

Conflicts:
	include/conversation.php
---

48309a25eccbd15ec02a62bda116c721859b53fe