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)
commitf29348f16332b378ab5533b887796a4ddcd1804b
treec4fade7e08c90b6690d372c791fbee98d2ae48ca
parentab90ce14315a7f59bb42f9a51e13dd8bfd31b084
parent2a4978c8ccd195a90b6ba7033c4f124ff77e4b09
Merge remote-tracking branch 'origin/master'

# Conflicts:
# build/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy