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)
commita87b2b7485986ea0ea5f8ed0f20a0507ff8dc7d5
tree4e98c6b8625300992f64a6373ec9634fefea31a1
parentce1ff58f29fd7f79fd2a4e2263f8e10b3fa4f5af
parentddb5eb9c7740dce805900afc650e29406258f689
Merge branch 'mc/openvpn'