Merge branch 'maint'

diff --combined gui.c
index 0f0a4a94d435b6ca836d99b95cb76a74ecbfc6f8,c20bb7ac98c5d05a9c63c9103a69873b257f0dad..5a2e659d159e6b6225b5ec94adc2796138d5b358
--- 1/gui.c
--- 2/gui.c
+++ b/gui.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
 - * Copyright (C) 1998-2013 Andre Noll <maan@systemlinux.org>
 + * Copyright (C) 1998-2014 Andre Noll <maan@systemlinux.org>
   *
   * Licensed under the GPL v2. For licencing details see COPYING.
   */
@@@ -526,7 -526,7 +526,7 @@@ static int add_output_line(char *line, 
  
  static int loglevel;
  
 -__printf_2_3 void curses_log(int ll, const char *fmt,...)
 +static __printf_2_3 void curses_log(int ll, const char *fmt,...)
  {
        int color;
        char *msg;
@@@ -560,7 -560,6 +560,6 @@@ static void setup_signal_handling(void
        para_install_sighandler(SIGCHLD);
        para_install_sighandler(SIGWINCH);
        para_install_sighandler(SIGUSR1);
-       para_sigaction(SIGHUP, SIG_IGN);
  }
  
  /* kill every process in the process group and exit */