Merge remote-tracking branch 'upstream/hmac_support' into hmac_support
authorFranck Joncourt <franck@debian.org>
Sat, 9 Mar 2013 10:54:45 +0000 (11:54 +0100)
committerFranck Joncourt <franck@debian.org>
Sat, 9 Mar 2013 10:54:45 +0000 (11:54 +0100)
commit469f9a5f395ec56dc23e7ef14561abb38fbb7a43
tree88f3b704982c9495cc07fc94e9511079480c4fbd
parent053db37c0dd711ff7c189fb84f498af859cb7a4c
parent1a39047b925666bc90436ea72b090a29790710d3
Merge remote-tracking branch 'upstream/hmac_support' into hmac_support

Conflicts:
client/cmd_opts.h
client/config_init.c
client/cmd_opts.h
client/config_init.c
client/fwknop_common.h