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)
1  2 
src/ipcalc.h

diff --cc src/ipcalc.h
Simple merge