From: Andre Noll Date: Tue, 11 Jun 2013 18:41:49 +0000 (+0200) Subject: Merge branch 't/stdin_stdout_fixes' X-Git-Tag: v0.4.13~31 X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=d46a0767b58654f15f16406cf99296287bd0d534;hp=d46a0767b58654f15f16406cf99296287bd0d534;p=paraslash.git Merge branch 't/stdin_stdout_fixes' Was cooking for almost a month. b99b4a stdin/stdout: Restore fd flags on shutdown. Conflicts: stdin.c stdout.c ---