Merge branch 'master', remote-tracking branch 'sami/ng'

diff --cc proc/readproc.c
Simple merge

diff --cc proc/sysinfo.c
Simple merge

diff --cc proc/version.c
Simple merge

diff --cc ps/display.c
Simple merge

diff --cc ps/parser.c
Simple merge

diff --cc ps/ps.1
Simple merge