svn merge -r14163:14173 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

NEWS

doc/man/man1/squeue.1

src/plugins/sched/wiki/get_nodes.c

src/plugins/sched/wiki/msg.h

src/plugins/sched/wiki2/get_nodes.c

src/plugins/sched/wiki2/msg.c

src/plugins/sched/wiki2/msg.h