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

Trivial merge