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

author Michael Vogel <icarus@dabo.de>

Sun, 11 Oct 2015 03:11:46 +0000 (05:11 +0200)

committer Michael Vogel <icarus@dabo.de>

Sun, 11 Oct 2015 03:11:46 +0000 (05:11 +0200)
author Michael Vogel <icarus@dabo.de>
Sun, 11 Oct 2015 03:11:46 +0000 (05:11 +0200)
committer Michael Vogel <icarus@dabo.de>
Sun, 11 Oct 2015 03:11:46 +0000 (05:11 +0200)
diff --cc include/conversation.php
Simple merge
diff --cc mod/dirfind.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Sun, 11 Oct 2015 03:11:46 +0000 (05:11 +0200)
committer	Michael Vogel <icarus@dabo.de>
	Sun, 11 Oct 2015 03:11:46 +0000 (05:11 +0200)
		1	2
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/dirfind.php	patch \|	diff1 \|	diff2 \|	blob \| history