Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 18 Aug 2014 11:06:42 +0000 (13:06 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 18 Aug 2014 11:06:42 +0000 (13:06 +0200)
commitfd53a80807597e4b57c8f6d16eaf0253f6568890
tree1db12c940cc0c1e4593f1ea6bf291aadf19b6ade
parentc0058d821190f9496918c487de9d270dc0834122
parentb5e4457cc9056323160ecde5ae1786299e2c480c
Merge remote-tracking branch 'origin/master'