Merge commit 'refs/merge-requests/2' of git://gitorious.org/procps/procps into merge-requests/2

Conflicts: uptime.c
2013-09-11 20:50:48 +10:00
parent 13f20a4811 3e7f78d296
commit 5e4d9d5a92
7 changed files with 101 additions and 34 deletions
--- a/w.c
+++ b/w.c
@ -575,7 +575,7 @@ int main(int argc, char **argv)

 	if (header) {
 		/* print uptime and headers */
-		print_uptime();
+		print_uptime(0);
 		/* Translation Hint: Following five uppercase messages are
 		 * headers. Try to keep alignment intact.  */
 		printf(_("%-*s TTY      "), userlen, _("USER"));