Skip to content
Commit 5bbc78f6 authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

Merge commit 'ff05abe4' 

Conflicts:
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
parents 6b3b5557 ff05abe4
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