From: Matthew Exon <github.mexon@spamgourmet.com>
Date: Mon, 25 Jan 2016 09:58:18 +0000 (+0100)
Subject: Merge remote branch 'upstream/develop' into mat/pullrequest5
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=50d4d376097614afe39b755e2e07fc7e84b9ae29;p=friendica.git

Merge remote branch 'upstream/develop' into mat/pullrequest5
---

50d4d376097614afe39b755e2e07fc7e84b9ae29