Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 19 Aug 2014 13:35:35 +0000 (15:35 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 19 Aug 2014 13:35:35 +0000 (15:35 +0200)
commitc21a4ea605ca2660db74604ede7b0d7480619e84
treecb289c52419aadc334bfbbcc7a21059b8c013800
parentae9c26af28076c929bb099e0c94aa0d0e352ddf5
parent168ec2ce90c91c57947c1183089c1291d2ef4059
Merge remote-tracking branch 'origin/master'