Merge remote-tracking branch 'upstream/hmac_support' into hmac_support
authorFranck Joncourt <franck@debian.org>
Wed, 20 Mar 2013 21:33:45 +0000 (22:33 +0100)
committerFranck Joncourt <franck@debian.org>
Wed, 20 Mar 2013 21:33:45 +0000 (22:33 +0100)
commit11ba15383227e763377fcd5cb4b2f31f880010a0
treec8ffd91bf9d99d62175fe0949041f42816851791
parent4b6318138746b851dc07bf00556f5d99364cceac
parent49c956dafc423bc7a2440e53589748a3c1287598
Merge remote-tracking branch 'upstream/hmac_support' into hmac_support