Merge branch 'master', remote branch 'origin'
[kivitendo-erp.git] / shopxtc / conf.php.default
2012-05-08 Holger LindemannNeue xtComm Shopschnittstelle.