Merge remote-tracking branch 'origin/master'

# Conflicts: # faq.html
dolebas · Mar 1, 2018 · d3ff8e0 · d3ff8e0
2 parents aff3462 + 9e42363
commit d3ff8e0
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1 +1,2 @@
 <[email protected]> <[email protected]>
+Stan Burnitt <[email protected]>