From: Florian Forster <sifnfors@stud.informatik.uni-erlangen.de>
Date: Fri, 17 Jul 2009 12:53:04 +0000 (+0200)
Subject: Merge branch 'liboping-1.2'
X-Git-Tag: liboping-1.3.0~7
X-Git-Url: https://git.octo.it/?p=liboping.git;a=commitdiff_plain;h=38bd1cff27396660917ba42cafa79ea4577b7fa3

Merge branch 'liboping-1.2'
---

38bd1cff27396660917ba42cafa79ea4577b7fa3