Fixed 1.0 miss-merges
authorSven-Haegar Koch <haegar@sdinet.de>
Fri, 26 Mar 2010 16:18:04 +0000 (17:18 +0100)
committerSven-Haegar Koch <haegar@sdinet.de>
Wed, 31 Mar 2010 03:01:39 +0000 (05:01 +0200)
commitffa1dc73dcd62a856325641972a13d398aa8121c
tree23ee808c3f16ee73c9b6ce4ddfe0945a18e68b42
parent103543aa2c15d9f1e2aa313a2e593a7524cce484
Fixed 1.0 miss-merges
src/conf.c
src/net_packet.c
src/net_setup.c
src/protocol_key.c
src/protocol_subnet.c