Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 18 Oct 2013 08:46:16 +0000 (10:46 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 18 Oct 2013 08:46:16 +0000 (10:46 +0200)

Trivial merge