Merge branch 'stable'

Conflicts:
	setup.py
This commit is contained in:
shimizukawa 2015-01-06 22:26:56 +09:00
commit a9c1ab9828

View File

@ -190,7 +190,7 @@ setup(
'Topic :: Utilities', 'Topic :: Utilities',
], ],
platforms='any', platforms='any',
packages=find_packages(exclude=['test']), packages=find_packages(exclude=['tests']),
include_package_data=True, include_package_data=True,
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [