Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 1 Apr 2015 13:36:03 +0000 (15:36 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 1 Apr 2015 13:36:03 +0000 (15:36 +0200)

Trivial merge