Merge remote-tracking branch 'origin/master'
authorDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Wed, 14 Jan 2015 17:59:03 +0000 (20:59 +0300)
committerDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Wed, 14 Jan 2015 17:59:03 +0000 (20:59 +0300)

Trivial merge