Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 22 Jan 2014 09:22:19 +0000 (13:22 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 22 Jan 2014 09:22:19 +0000 (13:22 +0400)
Conflicts:
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java


Trivial merge