Skip to content
GitLab
Commit 89a663b4 authored by Brian Christiansen's avatar Brian Christiansen
Browse files

Merge remote-tracking branch 'origin/slurm-15.08' 

Conflicts:
	NEWS
parents c36a2d6a 192cf0fc
Hide whitespace changes
Inline Side-by-side
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