Merge branch 'master' into nz/shared_shelf
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 14 Jul 2015 16:34:59 +0000 (18:34 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 14 Jul 2015 16:34:59 +0000 (18:34 +0200)
commitff82d4244100a476f791e9d883607520e963be6c
tree492fa2933b1c8362bdad75cf6fe0474770e8c82e
parentbeb20e7237a577c6154eedfa70fbb0e8df69d1ce
parentfb8ff04956480eef89a1175ebca73f4c5657fe23
Merge branch 'master' into nz/shared_shelf

# Conflicts:
# platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java