Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 10 Mar 2015 17:03:38 +0000 (18:03 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 10 Mar 2015 17:03:38 +0000 (18:03 +0100)

Trivial merge