Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 25 Sep 2015 11:26:31 +0000 (13:26 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 25 Sep 2015 11:26:31 +0000 (13:26 +0200)
1  2 
build/scripts/libLicenses.gant
lib/required_for_dist.txt

Simple merge
Simple merge