Merge remote-tracking branch 'origin/master' appcode/142.1196 clion/142.1195
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 15 Apr 2015 14:23:09 +0000 (16:23 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 15 Apr 2015 14:23:09 +0000 (16:23 +0200)
commitb570e29df12339ab0b8d480fb590a8dd352ba32f
treeaa1999d040f950f6fd0accaca305f2e606afa911
parentca7b57e1801a723b1530fe1fc880d7cadd4daa19
parentc2d1df09b90f0aebd0e5d2a95d17f952dc05a952
Merge remote-tracking branch 'origin/master'