Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 14 Dec 2015 14:44:30 +0000 (15:44 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 14 Dec 2015 14:44:30 +0000 (15:44 +0100)

Trivial merge