Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorBernd Bleßmann <bernd@kivitendo-premium.de>
Tue, 27 Oct 2015 14:07:19 +0000 (15:07 +0100)
committerBernd Bleßmann <bernd@kivitendo-premium.de>
Tue, 27 Oct 2015 14:07:19 +0000 (15:07 +0100)

Trivial merge