Merge branch 'master' of https://github.com/ShlXue/intellij-community
authorSergey Evdokimov <sergey.evdokimov@jetbrains.com>
Tue, 1 Apr 2014 14:32:30 +0000 (18:32 +0400)
committerSergey Evdokimov <sergey.evdokimov@jetbrains.com>
Tue, 1 Apr 2014 14:32:30 +0000 (18:32 +0400)

Trivial merge