From 3e43eeb60d5d56bfa1e575fc213ac14b936b7831 Mon Sep 17 00:00:00 2001
From: Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
Date: Mon, 14 Jul 2014 19:04:36 +0200
Subject: [PATCH] Version 1.1.0

https://github.com/cms-dev/cms/wiki/CMS-1.1.0-RELEASE-NOTES
---
 docs/conf.py | 2 +-
 setup.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 67b7b58c97..578ce871e1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0pre'
+release = '1.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index cba9f119df..f822aad99d 100755
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@ def do_setup():
                 os.chmod(file_, 0644)
 
     setup(name="cms",
-          version="1.1.0pre",
+          version="1.1.0",
           author="The CMS development team",
           author_email="contestms@freelists.org",
           url="https://github.com/cms-dev/cms",