summaryrefslogtreecommitdiff
path: root/.mailmap
AgeCommit message (Collapse)Author
2016-11-25Merge from master into 4.nextHeiko Schlittermann (HS12-RIPE)
Done with git merge --squash -x theirs master