Merge branch 'v3.6.3'

Conflicts:
	docs/changelog.rst
	pelican/__init__.py
	setup.py

docs/changelog.rst

@@ -1,10 +1,10 @@
 Release history
 ###############
 
-Next release
-============
+3.6.3 (2015-08-14)
+==================
 
-- Nothing yet
+* Fix permissions issue in release tarball
 
 3.6.2 (2015-08-01)
 ==================

docs/conf.py

@@ -18,7 +18,7 @@ copyright = '2015, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '3.6.2'
+last_stable = '3.6.3'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)

pelican/__init__.py

@@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
                            file_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.6.3.dev"
+__version__ = "3.6.3"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 

setup.py

@@ -22,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.6.3.dev",
+    version="3.6.3",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',