Merge branch 'IDEA-132015' of https://github.com/siosio/intellij-community
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 6 Mar 2015 09:48:07 +0000 (12:48 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Fri, 6 Mar 2015 09:48:07 +0000 (12:48 +0300)

Trivial merge