Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 10 Apr 2015 12:05:45 +0000 (14:05 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 10 Apr 2015 12:05:45 +0000 (14:05 +0200)

Trivial merge