# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-05-25 10:51:43
# Node ID 77b6e243b4cc5b702c15abd6d737798edbac60dc
# Parent  e740e1edde14d2196ec269e9b79c2cab1aba272a
# Parent  37409a27f83f726ecf1280afa06aa633e75d6ccb

merge: merged default into stable

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,6 @@
+[bumpversion]
+current_version = 4.0.1
+message = release: Bump version {current_version} to {new_version}
+
+[bumpversion:file:vcsserver/VERSION]
+
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -110,13 +110,13 @@
     };
   };
   gunicorn = super.buildPythonPackage {
-    name = "gunicorn-19.3.0";
+    name = "gunicorn-19.6.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b0/3d/c476010c920926d2b5b4be0a9a5f5dc0a50c667476ad4737774d44fa7591/gunicorn-19.3.0.tar.gz";
-      md5 = "faa3e80661efd67e5e06bba32699af20";
+      url = "https://pypi.python.org/packages/84/ce/7ea5396efad1cef682bbc4068e72a0276341d9d9d0f501da609fab9fcb80/gunicorn-19.6.0.tar.gz";
+      md5 = "338e5e8a83ea0f0625f768dba4597530";
     };
   };
   hgsubversion = super.buildPythonPackage {
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,7 +27,7 @@ wheel==0.29.0
 zope.deprecation==4.1.1
 zope.interface==4.1.3
 greenlet==0.4.7
-gunicorn==19.3.0
+gunicorn==19.6.0
 
 # Test related requirements
 mock==1.0.1
diff --git a/vcsserver/VERSION b/vcsserver/VERSION
--- a/vcsserver/VERSION
+++ b/vcsserver/VERSION
@@ -1,1 +1,1 @@
-4.0.0
\ No newline at end of file
+4.0.1
\ No newline at end of file