Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 14 Jul 2014 15:24:26 +0000 (17:24 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 14 Jul 2014 15:24:26 +0000 (17:24 +0200)
commit0fcfb36d6163c50d41b9f1281953f2d574e0c62b
tree280149bf657b06caaf6f30365a8aee5f0848940d
parent86b7bf5c1eb46e3442844fd01fb5a5a82ce3a88f
parent912c0d72c1d010ed6dceec830d45da9ab788afad
Merge remote-tracking branch 'origin/master'