Merge branch 'master' of ssh://psmisc.git.sourceforge.net/gitroot/psmisc/psmisc

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 03b6516c7205aab84e16bb1d5faf8db854691cc1,3419cbc15446fec156fb12717d382f108ee856d8..c36ba9032486a267a8fe45460d2f0f27f73e2011
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,11 +1,15 @@@
  Changes in 22.15
  ================
 -      * Really apply patch for SF#31110178 RH#651794
 -      * Conditionally use fork before stat calls
 +      * Really apply patch for SF#31110178 RH#651794, SF#3317431
 +      * Conditionally use fork before stat calls SF#3427522
        * Patch from Corrina Vinschen for compiling on cygwin
 +      * Use ENOENT not EBADE for FreeBSD Debian #631566
 +      * Fix prstat typos
 +      * Stop zombies by using waitpid Ubuntu #876387 by Peter Holik, SF#3429674
 +      * Fixed minor older/younger typo in killall.1 thanks to Maikel Linke
+       * Remove doubled content in src/lists.h
+       * Add another 2 for thread brackets in pstree.c
+       * Correct defines for timeout in configure.ac
  
  Changes in 22.14
  ================

diff --cc configure.ac
Simple merge