Merge remote-tracking branch 'origin/master'
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Wed, 4 Feb 2015 10:42:49 +0000 (13:42 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Wed, 4 Feb 2015 10:42:49 +0000 (13:42 +0300)
Conflicts:
platform/built-in-server/built-in-server.iml

1  2 
.idea/modules.xml
build/scripts/utils.gant
platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
platform/platform-resources/src/META-INF/PlatformExtensions.xml

Simple merge
Simple merge