Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 9 Apr 2015 08:23:03 +0000 (10:23 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 9 Apr 2015 08:23:03 +0000 (10:23 +0200)

Trivial merge