Merge remote-tracking branch 'upstream/master' into centos_listen

This commit is contained in:
Joona Hoikkala 2016-06-20 08:58:50 +03:00
commit 3c0fdeb334
No known key found for this signature in database
GPG key ID: C14AAE0F5ADCB854

View file

@ -69,7 +69,6 @@ dev_extras = [
'astroid==1.3.5',
'coverage',
'nose',
'nosexcover',
'pep8',
'pylint==1.4.2', # upstream #248
'tox',