Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 16 Jul 2015 11:13:01 +0000 (13:13 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 16 Jul 2015 11:13:01 +0000 (13:13 +0200)

Trivial merge