Commit 8884882f authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.4'

Conflicts:
	META
	NEWS
parents 05bc48d8 8bad9a3c
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