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

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

# Conflicts:
#	auxdir/x_ac_databases.m4
#	configure
parents e7c10e27 2fd4d7a6
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