Skip to content
Commit cce358bf authored by Jesse Glick's avatar Jesse Glick
Browse files

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

Conflicts:
	changelog.html
parents eb8d3100 ff80b579
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