Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 22 Dec 2014 18:34:36 +0000 (19:34 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 22 Dec 2014 18:34:36 +0000 (19:34 +0100)
commit0e49bd9409141233ef5e3508bbc6a77ce3047275
tree35d4462d6044c07639acb6c8ebce09093813ab9e
parent65c70afbd0ea4e0ecf88b58ace3d2799a709df39
parent753c71ff310fec2a2303bb96fcbf1b4554552674
Merge remote-tracking branch 'origin/master'