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)
commit9dbb62ae1ef53fccdefa1894d09c422719d5af83
tree610440d89aa95a340c6f30f42e42fec78e3e6535
parent31d94d50b1d841073d6c7160cfb83d7279d907cf
parentc83bc15c5eb9d6597df17cd9b421ab818548b210
Merge remote-tracking branch 'upstream/master'
client/config_init.c