Merge remote-tracking branch 'fjoncourt/master'
authorMichael Rash <mbr@cipherdyne.org>
Tue, 14 May 2013 03:10:26 +0000 (23:10 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Tue, 14 May 2013 03:10:26 +0000 (23:10 -0400)
Merged update from Franck - closes issue #71.

1  2 
client/config_init.c

Simple merge