Merge branch 'master' of https://github.com/amaembo/intellij-community
authorPavel Dolgov <pavel.dolgov@jetbrains.com>
Tue, 28 Jun 2016 16:58:22 +0000 (19:58 +0300)
committerPavel Dolgov <pavel.dolgov@jetbrains.com>
Tue, 28 Jun 2016 16:58:22 +0000 (19:58 +0300)
commita5e363f98c250580535f36b3c3ee33303ff85ff3
treeecb8923bfc5b0c60f1249f9c711f0feddd9bce67
parent3c634bbf8e494715493e7334fe1c1b7ed0f382d2
parentffccdd1f4028090bbe6a2250811ed3763698a4a8
Merge branch 'master' of https://github.com/amaembo/intellij-community
Accept pull request https://github.com/JetBrains/intellij-community/pull/421/