Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Tue, 13 May 2014 09:27:30 +0000 (13:27 +0400)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Tue, 13 May 2014 09:27:30 +0000 (13:27 +0400)

Trivial merge