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

Trivial merge