Merge branch 'master' of git://github.com/asedunov/intellij-community into pull97
authorDmitry Jemerov <yole@jetbrains.com>
Tue, 10 Sep 2013 19:14:29 +0000 (21:14 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Tue, 10 Sep 2013 19:14:29 +0000 (21:14 +0200)

Trivial merge