Merge the master branch into the dev branch.

This commit is contained in:
Dave Halter committed 2015-02-09 14:41:41 +01:00
commit 8775d90173
7 files changed
+18 -9

No files matched your search

+1
View File
@@ -42,6 +42,7 @@ setup(name='jedi',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Text Editors :: Integrated Development Environments (IDE)',
'Topic :: Utilities',