From 02e7dcdc87ce5037ef61a0e9261df6369e773c15 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 29 Jan 2012 20:06:07 +0100
Subject: [PATCH] Fix conf.py for 2.2 release

---
 en/_theme  | 2 +-
 en/conf.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/en/_theme b/en/_theme
index a32137e07..65a4cd407 160000
--- a/en/_theme
+++ b/en/_theme
@@ -1 +1 @@
-Subproject commit a32137e076d0cfbcec79c4f7fd04ab55fbbdc8e6
+Subproject commit 65a4cd4073a46176dfefe031d75724b0e4d80269
diff --git a/en/conf.py b/en/conf.py
index fbb344b04..7e785aeb4 100644
--- a/en/conf.py
+++ b/en/conf.py
@@ -38,14 +38,14 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Doctrine 2 ORM'
-copyright = u'2010-11, Doctrine Project Team'
+copyright = u'2010-12, Doctrine Project Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.1'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
 release = '2.1'