Merge from master into 4.next
[users/heiko/exim.git] / .mailmap
2016-11-25 Heiko Schlitterman... Merge from master into 4.next