Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorBernd Bleßmann <bernd@kivitendo-premium.de>
Mon, 6 Jan 2014 13:57:22 +0000 (14:57 +0100)
committerBernd Bleßmann <bernd@kivitendo-premium.de>
Mon, 6 Jan 2014 13:57:22 +0000 (14:57 +0100)

Trivial merge