Merge pull request #528 from nmav/no-vpn
authorChristian Schoenebeck <christian.schoenebeck@gmail.com>
Sun, 1 Nov 2015 16:19:26 +0000 (17:19 +0100)
committerChristian Schoenebeck <christian.schoenebeck@gmail.com>
Sun, 1 Nov 2015 16:19:26 +0000 (17:19 +0100)
commitfbc27d1b4840aca80e5ebc89e6261e9e99609412
treecaff453575ae12507295552a3cd1f62341c3cb15
parent0953190cf4ff40e9a58088ffa25908552fc365cc
parent14b510e4a1cd6fd77f2015cd0cdfd40288e96003
Merge pull request #528 from nmav/no-vpn

ocserv: removed unnecessary option and add proxy arp option