Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorBernd Bleßmann <bernd@kivitendo-premium.de>
Wed, 29 Apr 2015 17:26:04 +0000 (19:26 +0200)
committerBernd Bleßmann <bernd@kivitendo-premium.de>
Wed, 29 Apr 2015 17:26:04 +0000 (19:26 +0200)

Trivial merge