Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 7 Aug 2014 10:11:34 +0000 (12:11 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 7 Aug 2014 10:11:34 +0000 (12:11 +0200)

Trivial merge