Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Thu, 25 Jul 2013 13:35:56 +0000 (17:35 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Thu, 25 Jul 2013 13:35:56 +0000 (17:35 +0400)

Trivial merge