Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 13 Dec 2013 13:00:45 +0000 (14:00 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 13 Dec 2013 13:00:45 +0000 (14:00 +0100)

Trivial merge