Merge branch 'winwarnings' of https://github.com/dechamps/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 12 Jul 2014 20:19:45 +0000 (22:19 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 12 Jul 2014 20:19:45 +0000 (22:19 +0200)
1  2 
src/net_packet.c

Simple merge