Commit 943b8d27 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.4'

Conflicts:
	NEWS
parents ee71e2a4 4dc4fe90
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