From: fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 15 Jun 2015 12:00:18 +0000 (+0200)
Subject: Merge pull request #1672 from tobiasd/20150614-frank
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1cd5a3184d70f07e2bd6cdb1668d50e90cf5afac;p=friendica.git

Merge pull request #1672 from tobiasd/20150614-frank

resolving merge issues with DE doc merging
---

1cd5a3184d70f07e2bd6cdb1668d50e90cf5afac