merge 1.3 into stable

--HG--
rename : docs/usage/enable_git.rst => docs/usage/git_support.rst
rename : rhodecode/lib/smtp_mailer.py => rhodecode/lib/rcmail/smtp_mailer.py

1 files changed, 12 insertions, 11 deletions

diff --git a/setup.py b/setup.py
index 7aaa1fa2..52e6a88d 100644
--- a/setup.py
+++ b/setup.py
@@ -7,20 +7,21 @@ from rhodecode import requirements
 if __py_version__ < (2, 5):
     raise Exception('RhodeCode requires python 2.5 or later')
 
-
 dependency_links = [
 ]
 
-classifiers = ['Development Status :: 5 - Production/Stable',
-               'Environment :: Web Environment',
-               'Framework :: Pylons',
-               'Intended Audience :: Developers',
-               'License :: OSI Approved :: GNU General Public License (GPL)',
-               'Operating System :: OS Independent',
-               'Programming Language :: Python',
-               'Programming Language :: Python :: 2.5',
-               'Programming Language :: Python :: 2.6',
-               'Programming Language :: Python :: 2.7', ]
+classifiers = [
+    'Development Status :: 5 - Production/Stable',
+    'Environment :: Web Environment',
+    'Framework :: Pylons',
+    'Intended Audience :: Developers',
+    'License :: OSI Approved :: GNU General Public License (GPL)',
+    'Operating System :: OS Independent',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 2.5',
+    'Programming Language :: Python :: 2.6',
+    'Programming Language :: Python :: 2.7',
+]
 
 
 # additional files from project that goes somewhere in the filesystem