Merge branch 'smevok' of https://github.com/erokhins/intellij-community
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Wed, 16 Oct 2013 19:18:03 +0000 (23:18 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Wed, 16 Oct 2013 19:18:03 +0000 (23:18 +0400)

Trivial merge