Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 20 Dec 2013 10:52:44 +0000 (11:52 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 20 Dec 2013 10:52:44 +0000 (11:52 +0100)

Trivial merge