Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Tue, 8 Jul 2014 17:13:51 +0000 (19:13 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Tue, 8 Jul 2014 17:13:51 +0000 (19:13 +0200)

Trivial merge