]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/bugs/ntp-stable-1595
authorLinux Karlsson <karlsson@ntp.org>
Wed, 28 Jul 2010 16:19:25 +0000 (18:19 +0200)
committerLinux Karlsson <karlsson@ntp.org>
Wed, 28 Jul 2010 16:19:25 +0000 (18:19 +0200)
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/bugs/ntp-dev-1595

bk: 4c50588dRm1mERFL2N8tJRdP2ghRQw

1  2 
sntp/crypto.c

diff --cc sntp/crypto.c
Simple merge