Commit 0c577bab authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.4'

Conflicts:
	NEWS
parents f5a5b3b2 f0324da5
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