From cf809cbc0835a9da25b2020a8f3e49966c5ebd74 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 8 Jan 2016 18:57:31 +0100
Subject: [PATCH] Version 0.5.3

---
 CHANGELOG | 6 ++++--
 VERSION   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5ab20e785e4..ccd7dcf73ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,13 +4,15 @@ Formerly known as 'gitlab-git-http-server'.
 
 0.5.3
 
+Fixes merge error in 0.5.2.
+
+0.5.2 (broken!)
+
 - Always check with upstream if files in /uploads/ may be served
 - Fix project%2Fnamespace API project ID's
 - Prevent archive zombies when using gzip or bzip2
 - Don't show pretty error pages in development mode
 
-0.5.2
-
 0.5.1
 
 Deprecate -relativeURLRoot option, use -authBackend instead.
diff --git a/VERSION b/VERSION
index cb0c939a936..be14282b7ff 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.2
+0.5.3
-- 
2.30.9