Merge branch 'master' of http://wagnertech.de/git/kivitendo-erp t4
authorMichael Wagner <michael@wagnertech.de>
Mon, 6 Feb 2017 21:07:11 +0000 (22:07 +0100)
committerMichael Wagner <michael@wagnertech.de>
Mon, 6 Feb 2017 21:07:11 +0000 (22:07 +0100)

Trivial merge