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)
commit47a7ffe22bc82f8f60867979842d6147b0bc4bbf
treedfa1969771f3aa669d7b79f7ddb0766b4a20d6b9
parent5413d1c48c9e37adada0b7c74018d7da5746d188
parentd125146c37de1e31e1a59bc133c64c59ea22ea1e
Merge remote-tracking branch 'upstream/master'
client/config_init.c
server/config_init.c