Code

Merge branch 'mc/openvpn'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 7 Dec 2009 10:53:08 +0000 (11:53 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 7 Dec 2009 10:53:08 +0000 (11:53 +0100)

Trivial merge