Merge remote-tracking branch 'origin/master'
authorVladimir Orlov <vladimir.orlov@jetbrains.com>
Fri, 17 Jan 2014 11:28:32 +0000 (15:28 +0400)
committerVladimir Orlov <vladimir.orlov@jetbrains.com>
Fri, 17 Jan 2014 11:28:32 +0000 (15:28 +0400)

Trivial merge