Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 15 Jan 2014 14:00:10 +0000 (15:00 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 15 Jan 2014 14:00:10 +0000 (15:00 +0100)

Trivial merge