From: Michael Vogel <icarus@dabo.de>
Date: Sun, 12 Apr 2015 07:59:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1058d055d16f0cd7ce000c22b038dbad86334ce3;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1504-contact-update

Conflicts:
	mod/contacts.php
---

1058d055d16f0cd7ce000c22b038dbad86334ce3