Merge branch 'master' into samesversion

diff --cc l2tpns.c
index 17c440b,55621a5..84bb7a7
--- 1/l2tpns.c
--- 2/l2tpns.c
+++ b/l2tpns.c
@@@ -182,7 -186,7 +183,8 @@@ config_descriptt config_values[] = 
        CONFIG("disable_sending_hello", disable_sending_hello, BOOL),
        CONFIG("disable_no_spoof", disable_no_spoof, BOOL),
        CONFIG("bind_multi_address", bind_multi_address, STRING),
 +      CONFIG("grp_txrate_average_time", grp_txrate_average_time, INT),
+       CONFIG("pppoe_only_equal_svc_name", pppoe_only_equal_svc_name, BOOL),
        { NULL, 0, 0, 0 }
  };
  

diff --cc l2tpns.h
Simple merge

diff --cc pppoe.c
Simple merge