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)
commit72f7af1bbc6eafbee060c4a994c4f585d951c5aa
tree48131eb7eb8cd2663bcfea564e3c317747318d6a
parentfb4c1af874110dabcda5bfd9f24007599ecbb9cc
parentfdee8bcc695478367020c0c04adc2893cdc61295
Merge remote-tracking branch 'origin/master'

Conflicts:
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java