Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 18 Sep 2014 15:14:07 +0000 (17:14 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 18 Sep 2014 15:14:07 +0000 (17:14 +0200)
commitf9bf3afa5894f69a0991aed57e7e52ff3c6ea715
treeba7e7ee3635db9c6b151aec803235eeb0598ef11
parent09b156905597bc6fbceee30eacb48f3ec7c7e6b4
parentb57045fabdecfb876efa5c61f54aade9391a667d
Merge remote-tracking branch 'origin/master'