Merge branch 'stable' into niit
authorHenning Rogge <hrogge@googlemail.com>
Sat, 9 Jan 2010 11:11:22 +0000 (12:11 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Sat, 9 Jan 2010 11:11:22 +0000 (12:11 +0100)
commit5bb94096a018031e7fc7a537b1fa8de9655ad5c0
tree2a5ea57db60b7ae311a91d574f10a398ca2e8829
parent5b61766a07e08fcf3d8b7ba13e751630deafe02f
parent650456fe451635291f7931ad3769f85320a49fe7
Merge branch 'stable' into niit
src/ipcalc.h