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

Trivial merge