Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 3 Nov 2014 10:23:07 +0000 (11:23 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 3 Nov 2014 10:23:07 +0000 (11:23 +0100)
Conflicts:
python/edu/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java


Trivial merge