Commit 3b1cdb84 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-14.11'

Conflicts:
	META
	NEWS
parents e8fd126e 527b61ec
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