Merge commit '77e9695dace417d550bdcce75fe2a0dd860c239b'
[chef.git] / .mailmap
1 Grant Slater <openstreetmap@firefishy.com> <git@firefishy.com>
2 Jochen Topf <jochen@topf.org> <jochen@remote.org>