Merge branch 'next' into epc

srsepc/epc.conf.example

@@ -10,12 +10,9 @@
 # tac:              16-bit Tracking Area Code.
 # mcc:              Mobile Country Code
 # mnc:              Mobile Network Code
-<<<<<<< HEAD
-# mme_bindx_addr:   IP subnet to listen for eNB S1 connnections
 # apn:		          Set Access Point Name (APN)
-=======
+# mme_bind_addr:    IP bind addr to listen for eNB S1-MME connnections
-# mme_bind_addr:    IP bind addr to listen for eNB S1 connnections
+# dns_addr:         DNS server address for the UEs
->>>>>>> epc
 #
 #####################################################################
 [mme]
@@ -26,6 +23,7 @@ mcc = 001
 mnc = 01
 mme_bind_addr = 127.0.1.100
 apn = srsapn
+dns_addr = 8.8.8.8
 
 #####################################################################
 # HSS configuration