Merge remote-tracking branch 'origin/master'
authorVladimir Orlov <vladimir.orlov@jetbrains.com>
Thu, 20 Feb 2014 14:45:19 +0000 (18:45 +0400)
committerVladimir Orlov <vladimir.orlov@jetbrains.com>
Thu, 20 Feb 2014 14:45:19 +0000 (18:45 +0400)

Trivial merge