Merge remote-tracking branch 'origin/master'
authorVladimir Orlov <vladimir.orlov@jetbrains.com>
Thu, 5 Dec 2013 18:52:06 +0000 (22:52 +0400)
committerVladimir Orlov <vladimir.orlov@jetbrains.com>
Thu, 5 Dec 2013 18:52:06 +0000 (22:52 +0400)

Trivial merge