Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Tue, 25 Jun 2013 21:03:28 +0000 (23:03 +0200)
committerFranck Joncourt <franck@debian.org>
Tue, 25 Jun 2013 21:03:28 +0000 (23:03 +0200)
1  2 
client/config_init.c
server/config_init.c

Simple merge
Simple merge