Fix violation of RFC 3633: include Prefix Delegation's valid lifetime in router advertisements
Merge branch 'master' of https://github.com/RMerl/asuswrt-merlin into ipv6
Initialize lifetime variables
Fix for wrong values
Use inner list
Fix compile error
Cleanup
Pass prefix (and length) to script
Remove debug statements
Pass correct valid and preferred lifetime to radvd
Merge pull request #591 from pinwing/ipv6

Set valid and preferred lifetimes in router advertisements to be no later than the lifetimes of the delegated prefix
Updated documentation
openvpn: A few files missed when updating to 2.3.3
Merged with GPL 374_5656
Moved settings from the Others tab to the Samba tab, and removed that page that's no longer needed
webui: Restart the same services as the 'Others' page we have migrated here
Bumped revision to 42 Alpha 2
ufsd: Added missed 5656 updated file
dnsfilter: Norton ConnectSafe came back from the dead - re-adding it
Merge branch 'master' of github.com:RMerl/asuswrt-merlin

Conflicts:
	release/src/router/dnsmasq/CHANGELOG
	release/src/router/dnsmasq/VERSION
	release/src/router/dnsmasq/doc.html
	release/src/router/dnsmasq/src/config.h
	release/src/router/dnsmasq/src/dnsmasq.c
	release/src/router/dnsmasq/src/dnssec.c