Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ekaterina Tuzova
2014-05-12 15:40:29 +04:00
520 changed files with 7609 additions and 2816 deletions
@@ -87,7 +87,7 @@ public class BuildoutConfigurable implements Configurable, NonDefaultProjectConf
@Nls
@Override
public String getDisplayName() {
return "Buildout Support";
return "Buildout";
}
@Override