merge PR #2 by @torbjoernk

* upstream/pr/2/head: update contributors Signed-off-by: Torbjörn Klatt <[email protected]>
JLESC · Jan 20, 2016 · 084c369 · 084c369
2 parents 59677e5 + 6c72bc2
commit 084c369
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1 +1,2 @@
 Torbjörn Klatt <[email protected]> <[email protected]>
+Robert Speck <[email protected]> <[email protected]>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1 +1,2 @@
 Torbjörn Klatt <[email protected]>
+Robert Speck <[email protected]>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		Torbjörn Klatt <[email protected]> <[email protected]>
		Robert Speck <[email protected]> <[email protected]>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		Torbjörn Klatt <[email protected]>
		Robert Speck <[email protected]>