Merge branch 'master' of git://github.com/asedunov/intellij-community into pull101
authorDmitry Jemerov <yole@jetbrains.com>
Thu, 12 Sep 2013 13:25:59 +0000 (15:25 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Thu, 12 Sep 2013 13:25:59 +0000 (15:25 +0200)

Trivial merge