Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 31 Aug 2015 17:31:21 +0000 (19:31 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 31 Aug 2015 17:31:21 +0000 (19:31 +0200)
commitf67daf3cbb45ccf358c108a6144d3894109d956f
treecc009ef1638396c18425d277f3ae2ca0a204700d
parent2050e434f9d0a30cc5383492615d48ebe0b5a4e6
parentef4b63c175920d27f4e3bee8e0420eabd37fa50c
Merge remote-tracking branch 'origin/master'