Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 24 Feb 2015 13:15:19 +0000 (14:15 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 24 Feb 2015 13:15:19 +0000 (14:15 +0100)

Trivial merge