Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 1 Aug 2014 09:54:28 +0000 (13:54 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 1 Aug 2014 09:54:28 +0000 (13:54 +0400)
commit3b266aa32198373cfcfb4cafdff540609bec54d1
treec69e6afe8973102fd73103a176a12aac5ef7c576
parenta4d54fa1d5125904af2b5805f54209aeb68cbeaa
parentfacd767c24a11273986e50fe3da45aa4672412ad
Merge branch 'svn_18_3'

Conflicts:
plugins/git4idea/src/git4idea/history/GitDiffFromHistoryHandler.java
platform/util/resources/misc/registry.properties
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java