Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorBernd Bleßmann <bernd@kivitendo-premium.de>
Tue, 14 Apr 2015 13:24:01 +0000 (15:24 +0200)
committerBernd Bleßmann <bernd@kivitendo-premium.de>
Tue, 14 Apr 2015 13:24:01 +0000 (15:24 +0200)

Trivial merge