Merge remote-tracking branch 'origin/master' clion/140.1814
authorDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Mon, 19 Jan 2015 16:08:19 +0000 (19:08 +0300)
committerDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Mon, 19 Jan 2015 16:08:19 +0000 (19:08 +0300)

Trivial merge