pfSense

Fix javascript, close the select tag which will show the text

Forgot to add the dollar sign to make it a variable

Remove the old v6 address using the -alias method

Merge remote branch 'upstream/master'

Conflicts:
etc/inc/rrd.inc
usr/local/www/interfaces.php

Fix voucher disconnect sync issue

Do not error out for pptp/l2tp localip setting not set since its legitimate.

Merge 8b7d91267376d8b1e5e8d5748371430e2a601e23 https://rcs.pfsense.org/projects/pfsense/repos/mterron-clone/commits/8b7d91267376d8b1e5e8d5748371430e2a601e23 which fixes rc.shutdown issue

fix text

Actually remove the pid file before starting a new miniupnpd since it seems to not like it. Log provided on:http://forum.pfsense.org/index.php/topic,33371.msg180084.html#msg180084

Fix parse error