From: Tobias Hößl <tobias@hoessl.eu>
Date: Sat, 11 Aug 2012 08:08:23 +0000 (+0000)
Subject: Merge branch 'master' of github.com:CatoTH/friendica-addons
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7f4cb9cf06a933f85a04389548a9a592bdb186ab;p=friendica-addons.git

Merge branch 'master' of github.com:CatoTH/friendica-addons

Conflicts:
	dav/common/calendar_rendering.fnk.php
---

7f4cb9cf06a933f85a04389548a9a592bdb186ab