Merge branch 'master' of https://github.com/wagner-tech/kivitendo-erp
authorMichael Wagner <info@wagnertech.de>
Wed, 9 Mar 2016 13:06:48 +0000 (14:06 +0100)
committerMichael Wagner <info@wagnertech.de>
Wed, 9 Mar 2016 13:06:48 +0000 (14:06 +0100)

Trivial merge