From 0ca734c22f0e8a95929c56b0a48acc2b6c512b6c Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 20 Jun 2014 19:41:02 +0200
Subject: [PATCH] docs: Update authors

---
 .mailmap | 1 +
 AUTHORS  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index a427c69c..a3a35c2a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,5 +12,6 @@ Javier Domingo Cansino <javierdo1@gmail.com> <javier.domingo@fon.com>
 Lasse Bigum <lasse@bigum.org> <l.bigum@samsung.com>
 Nick Steel <kingosticks@gmail.com> <kingosticks@gmail.com>
 Janez Troha <janez.troha@gmail.com> <dz0ny@users.noreply.github.com>
+Janez Troha <janez.troha@gmail.com> <dz0ny@ubuntu.si>
 Luke Giuliani <luke@giuliani.com.au>
 Colin Montgomerie <kiteflyingmonkey@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index d7841635..1bc7c73b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,3 +38,5 @@
 - Arnaud Barisain-Monrose <abarisain@gmail.com>
 - nathanharper <nathan.sam.harper@gmail.com>
 - Pierpaolo Frasa <pfrasa@smail.uni-koeln.de>
+- Thomas Scholtes <thomas-scholtes@gmx.de>
+- Sam Willcocks <sam@wlcx.cc>