Commit 52e3975f authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.3'

Conflicts:
	META
	NEWS
parents db554e50 75bd6efe
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