From 76809b87a6e1e4bf9a9a8ea138f96bd62bb422d7 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Thu, 1 Jun 2017 13:06:15 -0700
Subject: [PATCH] Release Zulip Server 1.5.2.

---
 docs/changelog.md | 5 +++++
 version.py        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index 5a16854715..c702d3f6c5 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -4,6 +4,11 @@ All notable changes to the Zulip server are documented in this file.
 
 ### Unreleased
 
+### 1.5.2 -- 2017-06-01
+
+- CVE-2017-0896: Restricting inviting new users to admins was broken.
+- CVE-2015-8861: Insecure old version of handlebars templating engine.
+
 ### 1.5.1 -- 2017-02-07
 
 - Fix exception trying to copy node_modules during upgrade process.
diff --git a/version.py b/version.py
index 0094177489..60d1a5047f 100644
--- a/version.py
+++ b/version.py
@@ -1,2 +1,2 @@
-ZULIP_VERSION = "1.5.1"
+ZULIP_VERSION = "1.5.2"
 PROVISION_VERSION = '4.4'