Skip to content
GitLab
Commit 57a0b7a2 authored by Danny Auble's avatar Danny Auble
Browse files

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

# Conflicts:
#	NEWS
parents 5b4d2587 d378b297
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