From: Florian Forster <octo@verplant.org>
Date: Wed, 27 Oct 2010 12:32:13 +0000 (+0200)
Subject: Merge branch 'vm/qos'
X-Git-Tag: liboping-1.5.0~3
X-Git-Url: https://git.octo.it/?p=liboping.git;a=commitdiff_plain;h=4b7074ad0d82ced50c9bade2ccbf97189f4e65c1

Merge branch 'vm/qos'
---

4b7074ad0d82ced50c9bade2ccbf97189f4e65c1