Merge remote-tracking branch 'origin/master'
authorAlexander Kirillin <Alexander.Kirillin@jetbrains.com>
Mon, 7 Jul 2014 17:43:53 +0000 (21:43 +0400)
committerAlexander Kirillin <Alexander.Kirillin@jetbrains.com>
Mon, 7 Jul 2014 17:43:53 +0000 (21:43 +0400)

Trivial merge