From: Michael Vogel <icarus@dabo.de>
Date: Sat, 22 Mar 2014 22:48:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=81e05e62745ce8d18cb9d6fd9d80a7d5978b178e;p=friendica-addons.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	startpage/startpage.php
---

81e05e62745ce8d18cb9d6fd9d80a7d5978b178e