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)
commitf6ce6ef6ec6f99d720f92e0628c6aceae0d24c04
treea7288656143585d9cb840b993c8ba3e70c3010a7
parent7f9f2dbcd17799e12dea9c331a4860b45c7c885e
parent062d7dbc1a2b0604ea02bfac4c34601838b68356
Merge remote-tracking branch 'origin/master'

Conflicts:
plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
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