Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 26 Jun 2015 09:36:45 +0000 (11:36 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 26 Jun 2015 09:36:45 +0000 (11:36 +0200)

Trivial merge