From 2d4e489881dfee3c0ecea7609de89fee4cace224 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 22 May 2017 22:07:34 +0200
Subject: Prepare for v1.2

---
 CHANGES   | 2 +-
 README.md | 4 +++-
 miniircd  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index d2c1a83..f4730f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Unreleased
+1.2 (2017-05-22)
 
   * Find certificate specified with relative path when using --daemon.
   * Handle quickly disconnecting client without crashing.
diff --git a/README.md b/README.md
index ea8005a..24e6db9 100644
--- a/README.md
+++ b/README.md
@@ -102,9 +102,11 @@ Contributors
 ------------
 
 - Alex Wright
+- Braxton Plaxco
+- Hanno Foest
 - Jan Fuchs
+- Julien Monnier
 - Leandro Lucarella
-- Hanno Foest
 - Martin Maney
 - Matt Baxter
 - Matt Behrens
diff --git a/miniircd b/miniircd
index ba63820..0516ea8 100755
--- a/miniircd
+++ b/miniircd
@@ -33,7 +33,7 @@ from datetime import datetime
 from logging.handlers import RotatingFileHandler
 from optparse import OptionParser
 
-VERSION = "1.1"
+VERSION = "1.2"
 
 
 PY3 = sys.version_info[0] >= 3
-- 
cgit v1.2.3