From: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Date: Sun, 1 Nov 2015 16:19:26 +0000 (+0100)
Subject: Merge pull request #528 from nmav/no-vpn
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=fbc27d1b4840aca80e5ebc89e6261e9e99609412;p=project%2Fluci.git

Merge pull request #528 from nmav/no-vpn

ocserv: removed unnecessary option and add proxy arp option
---

fbc27d1b4840aca80e5ebc89e6261e9e99609412