# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-05-25 12:16:46
# Node ID f37f09afc0228e156f0e759ee091959a17058888
# Parent  9b3c78f46d0f7a90cf3f1d642a9426b8be8c5b33
# Parent  2b537e66787dee608717127eaf8c0545e96d88d9

merge: merge back stable into default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1,1 +1,2 @@
 1bd3e92b7e2e2d2024152b34bb88dff1db544a71 v4.0.0
+170c5398320ea6cddd50955e88d408794c21d43a v4.0.1