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)
ocserv: removed unnecessary option and add proxy arp option


Trivial merge