From: rabuzarus <trebor@central-unit>
Date: Wed, 25 May 2016 13:14:09 +0000 (+0200)
Subject: Merge branch 'master' of ../save/merge/frio into frio_merge
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8ec424325375aa923c7d2d78ac8ddcc352f09cff;hp=-c;p=friendica.git

Merge branch 'master' of ../save/merge/frio into frio_merge
---

8ec424325375aa923c7d2d78ac8ddcc352f09cff