Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Mon, 13 May 2013 14:30:27 +0000 (16:30 +0200)
committerFranck Joncourt <franck@debian.org>
Mon, 13 May 2013 14:30:27 +0000 (16:30 +0200)
1  2 
client/config_init.c

Simple merge