Auto merge of #14729 - nox:mailmap, r=emilio

Fix Clark Gaebel's entry in the mailmap

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14729)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-12-25 13:23:00 -08:00 committed by GitHub
commit 2d4e268dad

View file

@ -15,8 +15,8 @@ bors-servo <release+servo@mozilla.com> <lbergstrom+bors@mozilla.com>
bors-servo <release+servo@mozilla.com> <metajack+bors@gmail.com>
Brian Anderson <banderson@mozilla.com> <andersrb@gmail.com>
Brian J. Burg <burg@cs.washington.edu>
Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@uwaterloo.ca>
Clark Gaebel <cgaebel@mozilla.com> <cg.wowus.cg@gmail.com>
Clark Gaebel <cgaebel@mozilla.com> <cgaebel@uwaterloo.ca>
Connor Brewster <connor.brewster@eagles.oc.edu> <brewsterc@my.caspercollege.edu>
Daniel Robertson <dan.robertson@anidata.org> <danlrobertson89@gmail.com>
Daniel Robertson <dan.robertson@anidata.org> <drobertson@tripwire.com>