Merge branch 'release/0.5' into develop

beniwohli · Mar 28, 2012 · 14d833f · 14d833f
2 parents 139224b + 3b23e30
commit 14d833f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cms_search/__init__.py b/cms_search/__init__.py
@@ -1 +1 @@
-__version__ = '0.4.1'
+__version__ = '0.5'
diff --git a/docs/conf.py b/docs/conf.py
@@ -39,16 +39,16 @@
 
 # General information about the project.
 project = u'django-cms-search'
-copyright = u'2011, Divio GmbH'
+copyright = u'2012, Divio AG'
 
 # 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 = '0.4.1'
+version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.1'
+release = '0.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/metadata.py b/metadata.py
@@ -1,6 +1,6 @@
 package_name = 'cms_search'
 name = 'django-cms-search'
-author = 'Divio GmbH'
+author = 'Divio AG'
 author_email = 'developers@divio.ch'
 description = "An extension to django CMS to provide multilingual Haystack indexes"
 version = __import__(package_name).__version__