From: Florian Forster <octo@verplant.org>
Date: Sun, 27 Jan 2008 15:20:26 +0000 (+0100)
Subject: Merge branch 'origin'
X-Git-Tag: Net-Oping-1.02~5
X-Git-Url: https://git.octo.it/?p=liboping.git;a=commitdiff_plain;h=a4a12b87b1524f4ee12741d16dce94cc08ed9790

Merge branch 'origin'
---

a4a12b87b1524f4ee12741d16dce94cc08ed9790