From: Florian Forster <octo@verplant.org>
Date: Sat, 26 Jan 2008 09:36:20 +0000 (+0100)
Subject: Merge branch 'origin'
X-Git-Tag: Net-Oping-1.00~4
X-Git-Url: https://git.octo.it/?p=liboping.git;a=commitdiff_plain;h=fe4f50e98128beffb0e04844b383f804ca3ca13b

Merge branch 'origin'
---

fe4f50e98128beffb0e04844b383f804ca3ca13b