Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 19 Dec 2011 14:04:55 +0000 (18:04 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 19 Dec 2011 14:04:55 +0000 (18:04 +0400)
commit78eb15f4a963a2764f36fe735703d3c13e13eb31
treeb5901553be4cf575cf483e368d1ac4b268a17c51
parentd2a69e08474fb2f2fec8c25d696002f020ed26b0
parent35162f1f3ed19a4d8a20bf1ca214ae3117032d71
Merge remote branch 'origin/master'

Conflicts:
platform/vcs-impl/src/com/intellij/ide/actions/StartUseVcsAction.java
platform/vcs-impl/src/com/intellij/ide/actions/StartUseVcsAction.java