Conflicts:
	core/src/main/java/hudson/ClassicPluginStrategy.java
	core/src/main/java/hudson/cli/AddJobToViewCommand.java
	core/src/main/java/hudson/model/Run.java
	core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
	core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
	core/src/main/java/jenkins/model/IdStrategyDescriptor.java
	core/src/main/resources/hudson/model/AbstractProject/configure-common_ru.properties
	core/src/main/resources/hudson/model/AbstractProject/configure-common_tr.properties
	core/src/main/resources/hudson/model/FileParameterValue/value_pt_BR.properties
	core/src/main/resources/hudson/model/Job/index.jelly
	core/src/main/resources/hudson/model/TextParameterDefinition/config_pt_BR.properties
	core/src/main/resources/hudson/node_monitors/Messages_cs.properties
	core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
	core/src/main/resources/hudson/security/SecurityRealm/signup.jelly
	core/src/main/resources/hudson/slaves/CommandConnector/config_pt_BR.properties
	core/src/main/resources/hudson/views/BuildButtonColumn/column.properties
	core/src/main/resources/jenkins/diagnosis/HsErrPidList/index_pt_BR.properties
	core/src/main/resources/jenkins/model/IdStrategy/config.jelly
	core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
	core/src/main/resources/jenkins/model/Jenkins/load-statistics_pt_BR.properties
	core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
	core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
	core/src/main/resources/jenkins/slaves/systemInfo/EnvVarsSlaveInfo/systemInfo.jelly
	core/src/main/resources/jenkins/slaves/systemInfo/Messages.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_da.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_de.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_fr.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_ja.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_nl.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_pt_BR.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_zh_TW.properties
	core/src/main/resources/jenkins/triggers/Messages_fr.properties
	core/src/main/resources/lib/form/class-entry.jelly
	core/src/main/resources/lib/form/helpLink_pt_BR.properties
	core/src/main/resources/lib/form/link.jelly
	core/src/main/resources/lib/hudson/project/configurable.properties
	core/src/main/resources/lib/hudson/project/configurable_bg.properties
	core/src/main/resources/lib/hudson/project/configurable_es_AR.properties
	core/src/main/resources/lib/hudson/project/configurable_eu.properties
	core/src/main/resources/lib/hudson/project/configurable_gl.properties
	core/src/main/resources/lib/hudson/project/configurable_hi_IN.properties
	core/src/main/resources/lib/hudson/project/configurable_nl.properties
	core/src/main/resources/lib/hudson/project/configurable_tr.properties
	core/src/main/resources/lib/hudson/project/console-link.jelly
	core/src/main/resources/lib/hudson/project/console-link_pt_BR.properties
	core/src/main/resources/lib/layout/pane_de.properties
	core/src/main/resources/lib/layout/pane_pt.properties
	core/src/main/resources/lib/layout/pane_pt_BR.properties
	core/src/main/resources/lib/layout/task_pt.properties
	core/src/test/java/hudson/util/XStream2Test.java
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/model/AbstractItemSecurityTest.java
	test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
	war/src/main/webapp/scripts/msie.js