# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-06-14 14:13:33
# Node ID 0c5a8fcadff54e3b6dc9640f6cb45c5643d579a2
# Parent  ad3ca2b1ea1dc36b8a46d9d4b0cebb563438e3d9
# Parent  7fd2a797f4f2d35a284205f930024734e3d580b2

merged back stable into default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1,3 +1,4 @@
 c6fad7d1e61f22b1f4a4863eff207a04c27e9462 v4.0.0
 77b6e243b4cc5b702c15abd6d737798edbac60dc v4.0.1
 a359c072337fdd8e1e71df72cc520b8a9b042f80 v4.1.0
+49aa7ed030a36b7ceba149a21e587cb5d20b4946 v4.1.1
diff --git a/vcsserver/VERSION b/vcsserver/VERSION
--- a/vcsserver/VERSION
+++ b/vcsserver/VERSION
@@ -1,1 +1,1 @@
-4.2.0
\ No newline at end of file
+4.2.0