Commit ee2142ec authored by Moe Jette's avatar Moe Jette
Browse files

Merge branch 'slurm-2.2'

Conflicts:
	NEWS
parents 13c06789 7c7db5ad
Supports Markdown
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