# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-06-16 21:02:48
# Node ID 458bd0bef411cdfbc5100db3d34c03c0b5ffe3fa
# Parent  4d5060b7060ff90bd215c451cdc0c1743cad3d98
# Parent  fdf03b789cf13e8cb686ac6bb162dbb2bcc83bbd

release: merge back stable branch into default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -2,3 +2,4 @@ c6fad7d1e61f22b1f4a4863eff207a04c27e9462
 77b6e243b4cc5b702c15abd6d737798edbac60dc v4.0.1
 a359c072337fdd8e1e71df72cc520b8a9b042f80 v4.1.0
 49aa7ed030a36b7ceba149a21e587cb5d20b4946 v4.1.1
+f38ed1e1a31dce3c170b4d31585ba43471cf0705 v4.1.2
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -230,7 +230,7 @@
     };
   };
   rhodecode-vcsserver = super.buildPythonPackage {
-    name = "rhodecode-vcsserver-4.1.0";
+    name = "rhodecode-vcsserver-4.1.2";
     buildInputs = with self; [mock pytest WebTest];
     doCheck = true;
     propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb];