Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 24 Oct 2014 15:41:58 +0000 (17:41 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 24 Oct 2014 15:41:58 +0000 (17:41 +0200)
commit857916c4e86ff9cdf69a82562a72d5c5ebb535a8
tree010f3f122e395e26f8442fe05f053215fc33e154
parentbf66372b2b5b49ba4a93d8ac4f573ceb7857f5b8
parent968ce21ead064ec83619b5c459066b508b76fab0
Merge remote-tracking branch 'origin/master'