Merge remote-tracking branch 'origin/master'
authorVladimir Orlov <vladimir.orlov@jetbrains.com>
Wed, 5 Feb 2014 11:51:03 +0000 (15:51 +0400)
committerVladimir Orlov <vladimir.orlov@jetbrains.com>
Wed, 5 Feb 2014 11:51:03 +0000 (15:51 +0400)

Trivial merge