merge in oc-dr1-release history after reset to master
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 6e39988..87ddc78 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -4660,25 +4660,13 @@
type="default,supl,mms"
/>
- <apn carrier="TelenorMobilsurf"
+ <apn carrier="Com4"
mcc="240"
mnc="09"
- apn="services.telenor.se"
- proxy="173.30.253.241"
- port="8799"
+ apn="com4"
type="default,supl"
/>
- <apn carrier="Telenor MMS"
- mcc="240"
- mnc="09"
- apn="services.telenor.se"
- mmsc="http://mms"
- mmsproxy="173.30.253.241"
- mmsport="8799"
- type="mms"
- />
-
<apn carrier="Spring data"
mcc="240"
mnc="10"
@@ -4864,6 +4852,13 @@
type="mms"
/>
+ <apn carrier="Com4"
+ mcc="242"
+ mnc="09"
+ apn="com4"
+ type="default,supl"
+ />
+
<apn carrier="DNA Internet"
mcc="244"
mnc="03"