Initial commit
Merge branch 'h2history' into remotemaster
Merge pull request #1 from nicolas-f/remotemaster

Remotemaster
fix mail commit and ignore
fix mailmap
fix again mail map
Merge remote-tracking branch 'nicolas-f/master' into h2-patch

Conflicts:
	.gitignore