From 2712ecf282fa11468e95e8b76a7797cb08fbb0ed Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Wed, 24 May 2017 10:50:35 +0200
Subject: [PATCH] Merge pull request #3063 from stevepiercy/1.8-branch

---
 CONTRIBUTORS.txt |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 77fd41f..cbee08d 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -291,10 +291,14 @@
 
 - Mikko Ohtamaa, 2016/12/6
 
+- Jure Cerjak, 2016/12/7
+
 - Martin Frlin, 2016/12/7
 
 - Kirill Kuzminykh, 2017/03/01
 
 - Aleph Melo, 2017/04/16
 
-- Jeremy(Ching-Rui) Chen, 2017/04/
+- Jeremy(Ching-Rui) Chen, 2017/04/19
+
+- Fang-Pen Lin, 2017/05/22

--
Gitblit v1.9.3