Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 26 Nov 2015 15:46:53 +0000 (16:46 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 26 Nov 2015 15:46:53 +0000 (16:46 +0100)
commit7d7148677381ecccfa1c71f8e00569acf436897e
tree59ed82e983eff734de6d1f70a8d06a3e031d2c35
parent1580bf49d4d0bae7df24dfe3e2058100506c1388
parent03936c3f8a9e733401dacf9d4eea57180afb9e22
Merge remote-tracking branch 'origin/master' into mark_folder_as