Fixes #1412. Properly pass the page to match so users are not always presented with the change password screen. Proper fix.
Merge remote branch 'upstream/master'
Conflicts: conf.default/config.xml etc/inc/filter.inc etc/inc/globals.inc etc/inc/pfsense-utils.inc etc/inc/upgrade_config.inc usr/local/www/interfaces.php
Fixes #1412. Properly pass the page to match so users are not always presented with the change password screen.
Ticket #944. Also destory the previous interface if the user changing the vlan tag of an existing vlan entry.
Fixes #944. Use the correct interface name to destroy the previous vlan if the parent is changed.
Bug #1560. IPsec GUI needs to reject duplicate subnets in phase 2s for a given phase 1(site-to-site).
Use array_overlay()
Use array_extend
Remove debugging code
Add merge handler code
View revisions
Also available in: Atom