Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 22 Jan 2014 11:48:49 +0000 (12:48 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 22 Jan 2014 11:48:49 +0000 (12:48 +0100)

Trivial merge