From: Florian Forster <octo@verplant.org>
Date: Fri, 9 Jun 2006 21:26:19 +0000 (+0200)
Subject: Merge branch 'feature'
X-Git-Tag: liboping-0.3.0~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a7dd6052cd081f88e8a5defe9f72df5e1c155f0d;p=liboping.git

Merge branch 'feature'
---

a7dd6052cd081f88e8a5defe9f72df5e1c155f0d