From 75c30dfe18b26ca04efae2acbe35052fa0d93ed6 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 18 Jun 2017 08:46:27 +0200
Subject: [PATCH] Merge branch 'master' into pr/3034

---
 CONTRIBUTORS.txt |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index b8fb081..242fbbc 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -297,6 +297,14 @@
 
 - Kirill Kuzminykh, 2017/03/01
 
+- Aleph Melo, 2017/04/16
+
 - Jeremy(Ching-Rui) Chen, 2017/04/19
 
 - Russell Ballestrini, 2017/05/06
+
+- Fang-Pen Lin, 2017/05/22
+
+- Volker Diels-Grabsch, 2017/06/09
+
+- Denis Rykov, 2017/06/15

--
Gitblit v1.9.3