Tobias Hößl 7f4cb9cf06 Merge branch 'master' of github.com:CatoTH/friendica-addons
Conflicts:
	dav/common/calendar_rendering.fnk.php
2012-08-11 08:08:23 +00:00
..
2012-07-12 19:22:11 +00:00