Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Sat, 24 Oct 2015 14:00:24 +0000 (16:00 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Sat, 24 Oct 2015 14:00:24 +0000 (16:00 +0200)
commit2dbae98baa2222bc8987dc4a86ee9e3503830fbd
treeb36a1a20b2abe0695ec126e6d17e9b27d6525fb1
parenteeb9a899ec5c02268529fd72c3b7f2cc238fd6e9
parentebb3ccfe5bca2b3f0ac35da22384df965686ddfc
Merge remote-tracking branch 'origin/master' into mark_folder_as