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

Trivial merge