From: octo <octo>
Date: Fri, 12 May 2006 15:41:11 +0000 (+0000)
Subject: octo@huhu:~/liboping $ svn merge -r7:9 branches/liboping-0.1 trunk
X-Git-Tag: liboping-0.2.0~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dae22bf08bd44ad7f3f47048a231dd7c2d63bd3f;p=liboping.git

octo@huhu:~/liboping $ svn merge -r7:9 branches/liboping-0.1 trunk
---

dae22bf08bd44ad7f3f47048a231dd7c2d63bd3f