From: rabuzarus <trebor@central-unit>
Date: Sun, 12 Jun 2016 17:34:06 +0000 (+0200)
Subject: Merge develop into 1106-frio-settings
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0aa15f74fff017f325c9bebb5bbe0400f23553cc;p=friendica.git

Merge develop into 1106-frio-settings
---

0aa15f74fff017f325c9bebb5bbe0400f23553cc