From: Roland Haeder Date: Tue, 1 Mar 2016 17:31:33 +0000 (+0100) Subject: Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=95bfa17254e655af74e6cbe7a93785be011b2d62;p=friendica.git Merge branch 'rhaeder-develop' of github.com:Quix0r/friendica into rhaeder-develop Signed-off-by: Roland Haeder --- 95bfa17254e655af74e6cbe7a93785be011b2d62