Commit 82782b76 authored by jette's avatar jette
Browse files

Merge branch 'slurm-15.08'

Conflicts:
	NEWS
parents 1c5c9e6e 0db71fe4
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