Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Tue, 29 Apr 2014 14:42:42 +0000 (18:42 +0400)
committerKonstantin Bulenkov <kb@jetbrains.com>
Tue, 29 Apr 2014 14:42:42 +0000 (18:42 +0400)

Trivial merge