Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 13 Nov 2014 08:55:06 +0000 (11:55 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 13 Nov 2014 08:55:06 +0000 (11:55 +0300)
1  2 
python/helpers/pycharm/nose_utils.py

Simple merge