Merge branch 'master', remote branch 'origin'
[kivitendo-erp.git] / spool / .dummy