Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 2 Jun 2015 15:35:35 +0000 (17:35 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 2 Jun 2015 15:35:35 +0000 (17:35 +0200)

Trivial merge