Skip to content
Commit 425b727e authored by Daniel Beck's avatar Daniel Beck
Browse files

Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0 

Conflicts:
	cli/pom.xml
	core/pom.xml
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/PluginManagerTest.java
	war/pom.xml
parents dc94c2dc fa39668b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment