Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 21 Apr 2015 14:04:07 +0000 (16:04 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 21 Apr 2015 14:04:07 +0000 (16:04 +0200)

Trivial merge