From: Craig Small <csmall@enc.com.au>
Date: Fri, 24 Mar 2017 22:37:52 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: v23.0~17^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d3acbc3748e544d4aef48c608dc6b5e77e46c52;p=psmisc

Merge branch 'master' into 'master'

peekfd: usage help screen now contains long options list too

See merge request !5
---

6d3acbc3748e544d4aef48c608dc6b5e77e46c52