start
start
Merge branch 'master' of D:\Documents\Repository Git\_bare\iconarticles

Conflicts:
	config.inc.php
	lang/de_de_utf8.lang
a
alpha
Merge branch 'master' of https://github.com/studio-ahoi/ahoi_iconarticles