Merge remote-tracking branch 'dechamps/staticfix' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 12 Apr 2015 13:34:50 +0000 (15:34 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 12 Apr 2015 13:34:50 +0000 (15:34 +0200)
commit9e71b74ed83c51e0b35114a4f153b62b54fd3702
tree2ce4fba52268c39ac35e85b966dcb4294435d376
parent76a9be5bce43a1a7363c670882f5315c824c903c
parentfa432426df7e2e364e310ab4bac28e60f732a3c9
Merge remote-tracking branch 'dechamps/staticfix' into 1.1
src/net_packet.c