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

2011-10-01 23:23:30 +10:00
parent f7fb8bddf4 367fd902da
commit b9a408372e
43 changed files with 452 additions and 578 deletions
--- a/ps/display.c
+++ b/ps/display.c
@@ -46,7 +46,7 @@ static void signal_handler(int signo){
  fprintf(stderr,
    "\n\n"
    "Signal %d (%s) caught by ps (%s).\n"
-    "Please send bug reports to <feedback@lists.sf.net> or <albert@users.sf.net>\n",
+    "Please send bug reports to <procps@freelists.org>\n",
    signo,
    signal_number_to_name(signo),
    procps_version