Add contributor to our web page
Problem allocating threads with GPUs

If a node has GRES and multiple threads per core the select/cons_res
plugin can get stuck in an infinite loop.
See bug 475
Contributed by:
PREVOST Ludovic
NEC HPC Europe
Merge branch 'slurm-2.6' of http://github.com/SchedMD/slurm into slurm-2.6

Conflicts:
	NEWS