From: Florian Forster <octo@verplant.org>
Date: Fri, 7 Jul 2006 09:32:48 +0000 (+0200)
Subject: Merge branch 'origin'
X-Git-Tag: liboping-0.3.0~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=33a84dc3dca4be5fe92061153277eb5df8a54e7f;p=liboping.git

Merge branch 'origin'
---

33a84dc3dca4be5fe92061153277eb5df8a54e7f