Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMartin Helmling <MartinHelmling@octo-soft.de>
Tue, 7 Jan 2014 07:57:57 +0000 (08:57 +0100)
committerMartin Helmling <MartinHelmling@octo-soft.de>
Tue, 7 Jan 2014 07:57:57 +0000 (08:57 +0100)

Trivial merge