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)
commitdc9043c92d20ef479ea8c0a9114479c2cfd1f95f
treea41e7ac731210a0cb9d198029962a086dc6b4311
parentcf36583466c147e68264b29366af0f127228fe65
parent6c39c5eb5bd18ca69285e158d321aca47084158d
Merge remote-tracking branch 'origin/master'

Conflicts:
python/edu/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java