Code

Merge branch 'origin'
authorFlorian Forster <octo@verplant.org>
Sat, 26 Jan 2008 09:36:20 +0000 (10:36 +0100)
committerFlorian Forster <octo@verplant.org>
Sat, 26 Jan 2008 09:36:20 +0000 (10:36 +0100)
1  2 
src/liboping.c

diff --cc src/liboping.c
Simple merge