Merge branch 'v39/liboping-license'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Jul 2006 17:03:37 +0000 (19:03 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Jul 2006 17:03:37 +0000 (19:03 +0200)

Trivial merge