Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 1 Sep 2016 15:11:07 +0000 (17:11 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 1 Sep 2016 15:11:07 +0000 (17:11 +0200)
# Conflicts:
# build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy


Trivial merge