Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 31 Aug 2016 18:16:10 +0000 (20:16 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 31 Aug 2016 18:16:10 +0000 (20:16 +0200)
commita9560be199f9af25e28f7f5de6a9750ab35df9ec
tree57f5c2aa395f0936929d8fa561d4ebe381438029
parentfefc7a7f3410560d1396070dd5af0129ed16dff6
parentdde0b7c9f2d1e97eaf963e5b0df02342c4b393db
Merge remote-tracking branch 'origin/master'