Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Fri, 25 Jul 2014 13:52:32 +0000 (15:52 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Fri, 25 Jul 2014 13:52:32 +0000 (15:52 +0200)

Trivial merge