Files
jenkins/core
Kohsuke Kawaguchi da07e548b6 Merge remote-tracking branch 'origin/master' into jnlp3-protocol
Conflicts:
	core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java
	pom.xml
2016-02-02 11:08:29 +01:00
..