Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Aug 2015 15:54:37 +0000 (18:54 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Aug 2015 15:54:37 +0000 (18:54 +0300)
commit3a1da4798d81849fff5a66c21e55eed7dda46e94
tree2d4f5b3aa269892388eeab8db579c1decd351750
parentac2acc315ae55bd46303ffb8ffbc18a85cbfe6ff
parent8867cbff2fb94ef6b26cd49f1b5ad3af6104e4ce
Merge remote-tracking branch 'origin/master'