Merge branch 'liboping-1.2'
authorFlorian Forster <sifnfors@stud.informatik.uni-erlangen.de>
Fri, 17 Jul 2009 12:53:04 +0000 (14:53 +0200)
committerFlorian Forster <sifnfors@stud.informatik.uni-erlangen.de>
Fri, 17 Jul 2009 12:53:04 +0000 (14:53 +0200)
1  2 
src/liboping.c

diff --cc src/liboping.c
Simple merge