Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 18 May 2015 13:50:55 +0000 (16:50 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 18 May 2015 13:50:55 +0000 (16:50 +0300)
Conflicts:
plugins/git4idea/src/git4idea/history/GitHistoryProvider.java

1  2 
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java
plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnChangeList.java