Merge remote-tracking branch 'origin/PY-9727' into PY-9727
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 8 Dec 2015 18:20:50 +0000 (21:20 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 8 Dec 2015 18:20:50 +0000 (21:20 +0300)
commit58baa49f859650a9158cf8c44b8040439f980fd6
tree0e03fe9eb7a8e72125ad0f29496a360c862166d4
parent901c6d11800b54ade4bd90a166fd507a18a1a04e
parentb24115a45e4121e42e88d1cf65159c0ed2cdb407
Merge remote-tracking branch 'origin/PY-9727' into PY-9727

# Conflicts:
# python/src/com/jetbrains/python/testing/tox/PyToxCommandLineState.java
# python/src/com/jetbrains/python/testing/tox/PyToxConfiguration.java
# python/src/com/jetbrains/python/testing/tox/PyToxConfigurationSettings.java