Merge branch 'master' into more-channels

sites/tvpassport.com/tvpassport.com.channels.xml

@@ -91,13 +91,14 @@
     <channel lang="en" xmltv_id="KEYTDT3.us" site_id="mnt-keyttv3-santa-barbara-ca/33700">MNT (KEYT-DT3) Santa Barbara, CA</channel>
     <channel lang="en" xmltv_id="KDVRDT1.us" site_id="fox-kdvr-denver-co/1572">FOX (KDVR) Denver, CO</channel>
     <channel lang="en" xmltv_id="KDLTDT2.us" site_id="fox-kdlt2-odlt-sioux-falls-sd/1063">FOX (KDLT-DT2) Sioux Falls, SD</channel>
-	<channel lang="en" xmltv_id="KECIDT1.us" site_id="nbc-keci-missoula-mt/5053">NBC (KECI-TV) Missoula, MT</channel>
-	<channel lang="en" xmltv_id="KGANDT2.us" site_id="fox-kgan2-cedar-rapids-ia/18542">FOX (KGAN-DT2) Cedar Rapids, IA</channel>
-	<channel lang="en" xmltv_id="KHONDT2.us" site_id="cw-khondt2-honolulu-hi/5892">CW (KHON-DT2) Honolulu, HI</channel>
     <channel lang="en" xmltv_id="KIONDT1.us" side_id="cbs-kion-salinas-ca/2274">CBS (KION) Salinas, CA</channel>
     <channel lang="en" xmltv_id="KIONDT2.us" side_id="fox-35-kiontv2-monterey-ca/11612">FOX (KION-TV2) Monterey, CA</channel>
     <channel lang="en" xmltv_id="KIONDT3.us" side_id="ion-kiontv3-monterey-ca/18731">ION (KION-TV3) Monterey, CA</channel>
+    <channel lang="en" xmltv_id="KECIDT1.us" site_id="nbc-keci-missoula-mt/5053">NBC (KECI-TV) Missoula, MT</channel>
+    <channel lang="en" xmltv_id="KGANDT2.us" site_id="fox-kgan2-cedar-rapids-ia/18542">FOX (KGAN-DT2) Cedar Rapids, IA</channel>
+    <channel lang="en" xmltv_id="KHONDT2.us" site_id="cw-khondt2-honolulu-hi/5892">CW (KHON-DT2) Honolulu, HI</channel>
     <channel lang="en" xmltv_id="KNBCDT1.us" site_id="nbc-knbc-los-angeles-ca/2588">NBC (KNBC) Los Angeles, CA</channel>
+    <channel lang="en" xmltv_id="KOCEDT1.us" site_id="pbs-socal1-koce-huntington-beach-ca/2632">PBS (KOCE) Huntington Beach, CA</channel>
     <channel lang="en" xmltv_id="KPAXDT1.us" site_id="cbs-kpax-missoula-mt/4976">CBS (KPAX-TV) Missoula, MT</channel>
     <channel lang="en" xmltv_id="KPAXDT2.us" site_id="cw-kpaxtv2-missoula-mt/8949">CW (KPAX-DT2) Missoula, MT</channel>
     <channel lang="en" xmltv_id="KSATDT1.us" site_id="abc-ksat-san-antonio-tx/3071">ABC (KSAT) San Antonio, TX</channel>
@@ -192,9 +193,14 @@
     <channel lang="en" xmltv_id="WABCDT3.us" site_id="this-wabctv3-new-york-ny/11049">THIS (WABC-TV3) New York, NY</channel>
     <channel lang="en" xmltv_id="WABCDT4.us" site_id="hsn-wabctv4-new-york-ny/36168">HSN (WABC-TV4) New York, NY</channel>
     <channel lang="en" xmltv_id="WADLDT1.us" site_id="wadl-tv-detroit-mi/10217">MNT (WADL) Mount Clemens, MI</channel>
-    <channel lang="en" xmltv_id="WBALDT1.us" site_id="nbc-wbal-baltimore-md/3236">NBC (WBAL) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WBALDT1.us" site_id="nbc-wbal-baltimore-md/3236">NBC (WBAL-TV) Baltimore, MD</channel>
     <channel lang="en" xmltv_id="WBALDT2.us" site_id="metv-wbaltv2-baltimore-md/11796">MeTV (WBAL-DT2) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WBALDT4.us" site_id="the-grio-wbaltv4-baltimore-md/36930">The Grio (WBAL-DT4) Baltimore, MD</channel>
     <channel lang="en" xmltv_id="WBBZDT1.us" site_id="metv-wbbz-buffalo-ny/9936">Independent (WBBZ-TV) Springville, NY</channel>
+    <channel lang="en" xmltv_id="WBFFDT1.us" site_id="fox-wbff-baltimore-md/3593">FOX (WBFF) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WBFFDT2.us" site_id="mnt-wbff2-baltimore-md/32462">MNT (WBFF-DT2) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WBFFDT3.us" site_id="tbd-tv-wbff3-baltimore-md/8647">TBD (WBFF-DT3) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WBFFDT4.us" site_id="charge-wbff4-baltimore-md/33579">Charge (WBFF-DT4) Baltimore, MD</channel>
     <channel lang="en" xmltv_id="WBGUDT1.us" site_id="pbs-wbgu-bowling-green-oh/3025">PBS (WBGU-TV) Bowling Green, OH</channel>
     <channel lang="en" xmltv_id="WBKPDT1.us" site_id="cw-wbkp-calumet-mi/4943">CW (WBKP) Calumet, MI</channel>
     <channel lang="en" xmltv_id="WBSFDT1.us" site_id="cw-wbsf-flint-mi/6958">CW (WBSF) Bay City, MI</channel>
@@ -213,8 +219,14 @@
     <channel lang="en" xmltv_id="WDVBCD2.us" site_id="sstn-wdvbcd2-edison-nj/11068">SSTN (WDVB-CD2) Edison, NJ</channel>
     <channel lang="en" xmltv_id="WEDWDT1.us" site_id="connecticut-public-television-wedw-bridgeport/2065">Connecticut Public Television (WEDW) Bridgeport</channel>
     <channel lang="en" xmltv_id="WEDWDT3.us" site_id="cptv-spirit-wedwdt3-bridgeport-ct/11910">CPTV Spirit (WEDW-DT3) Bridgeport, CT</channel>
-	<channel lang="en" xmltv_id="WEVVDT2.us" site_id="fox-wevv2-evansville-in-hd/9720">FOX (WEVV) Evansville, IN</channel>
+    <channel lang="en" xmltv_id="WETADT1.us" site_id="pbs-weta-hd-washington-dc/8180">PBS (WETA-TV) Washington DC</channel>
+    <channel lang="en" xmltv_id="WEVVDT1.us" site_id="cbs-wevv-evansville-in/1801">CBS (WEVV) Evansville, IN</channel>
+    <channel lang="en" xmltv_id="WEVVDT2.us" site_id="fox-wevv2-evansville-in-hd/9720">FOX (WEVV-DT2) Evansville, IN</channel>
     <channel lang="en" xmltv_id="WEYIDT1.us" site_id="nbc-weyi-flint-mi/5136">NBC (WEYI-TV) Saginaw, MI</channel>
+    <channel lang="en" xmltv_id="WFAADT1.us" site_id="abc-wfaa-dallas-tx/1659">ABC (WFAA) Dallas, TX</channel>
+    <channel lang="en" xmltv_id="WFAADT2.us" site_id="accuweather-wfaa2-dallas-tx/14780">AccuWeather (WFAA-DT2) Dallas, TX</channel>
+    <channel lang="en" xmltv_id="WFAADT3.us" site_id="true-crime-network-wfaadt3-dallas-tx/7463">True Crime Network (WFAA-DT3) Dallas, TX</channel>
+    <channel lang="en" xmltv_id="WFAADT4.us" site_id="quest-wfaa4-dallas-tx/32427">Quest (WFAA-DT4) Dallas, TX</channel>
     <channel lang="en" xmltv_id="WFQXDT1.us" site_id="fox-wfqx-traverse-citycadillac-mi/483">FOX (WFQX-TV) Cadillac, MI</channel>
     <channel lang="en" xmltv_id="WFQXDT2.us" site_id="cw-wfqxtv2-traverse-citycadillac-mi/31612">CW (WFQX-DT2) Cadillac, MI</channel>
     <channel lang="en" xmltv_id="WFTYDT1.us" site_id="unimas-wfty-smithtown-ny/1961">UniMás (WFTY) Smithtown, NY</channel>
@@ -235,6 +247,10 @@
     <channel lang="en" xmltv_id="WJLPDT7.us" site_id="story-network/37281">Story (WJLP7) Middletown Township, NJ</channel>
     <channel lang="en" xmltv_id="WJMNDT1.us" site_id="wjmn-escanaba-mi/4993">MNT (WJMN-TV) Escanaba, MI</channel>
     <channel lang="en" xmltv_id="WJRTDT1.us" site_id="abc-wjrt-flint-mi/480">ABC (WJRT-TV) Flint, MI</channel>
+    <channel lang="en" xmltv_id="WJZDT1.us" site_id="cbs-wjz-baltimore-md/3237">CBS (WJZ) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WJZDT2.us" site_id="start-tv-wjztv2-baltimore-md/15663">Start TV (WJZ-DT2) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WJZDT3.us" site_id="dabl-wjztv3-baltimore-md/34180">DABL (WJZ-DT3) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WJZDT4.us" site_id="fave-tv-wjztv4-baltimore-md/35969">Fave TV (WJZ-DT4) Baltimore, MD</channel>
     <channel lang="en" xmltv_id="WKARDT1.us" site_id="pbs-wkar-east-lansing-mi/13241">PBS (WKAR-TV) East Lansing, MI</channel>
     <channel lang="en" xmltv_id="WKOBLD1.us" site_id="azteca-wkob-new-york-ny/5096">Azteca (WKOB) New York, NY</channel>
     <channel lang="en" xmltv_id="WKOBLD3.us" site_id="peace-tv-wkobld3-new-york-ny/11085">Peace TV (WKOB-LD3) New York, NY</channel>
@@ -253,6 +269,11 @@
     <channel lang="en" xmltv_id="WLNYDT5.us" site_id="circle-wlnytv5-riverhead-ny/34539">Circle (WLNY-TV5) Riverhead, NY</channel>
     <channel lang="en" xmltv_id="WLUCDT1.us" site_id="nbc-wluc-upper-michigan-mi/3163">NBC (WLUC-TV) Marquette, MI</channel>
     <channel lang="en" xmltv_id="WLUCDT2.us" site_id="fox-wluctv2-marquette-mi/13254">FOX (WLUC-DT2) Marquette, MI</channel>
+    <channel lang="en" xmltv_id="WMARDT1.us" site_id="abc-wmar-baltimore-md/3230">ABC (WMAR) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WMARDT2.us" site_id="grit-tv-wmartv2-baltimore-md/12547">Grit TV (WMAR-DT2) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WMARDT3.us" site_id="bounce-wmartv3-baltimore-md/15662">Bounce (WMAR-DT3) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WMARDT4.us" site_id="ion-mystery-wmar4-baltimore-md/33567">ION Mystery (WMAR-DT4) Baltimore, MD</channel>
+    <channel lang="en" xmltv_id="WMARDT5.us" site_id="court-tv-wmartv5-baltimore-md/34056">Court TV (WMAR-DT5) Baltimore, MD</channel>
     <channel lang="en" xmltv_id="WMBCDT2.us" site_id="quest-wmbctv2-newton-nj/16467">Quest (WMBC-TV2) Newton, NJ</channel>
     <channel lang="en" xmltv_id="WMBCDT5.us" site_id="new-tang-dynasty-tv-wmbcdt5-newton-nj/15033">New Tang Dynasty TV (WMBC-DT5) Newton, NJ</channel>
     <channel lang="en" xmltv_id="WMBQCD1.us" site_id="biztv-wmbqcd-new-york-ny/16459">Biz-TV (WMBQ-CD) New York, NY</channel>
@@ -289,6 +310,7 @@
     <channel lang="en" xmltv_id="WNYXLD2.us" site_id="cctv4-wnyxld2-new-york-ny/16442">CCTV-4 (WNYX-LD2) New York, NY</channel>
     <channel lang="en" xmltv_id="WNYXLD4.us" site_id="revn-wnyxld4-new-york-ny/16447">REV&apos;N (WNYX-LD4) New York, NY</channel>
     <channel lang="en" xmltv_id="WNYXLD5.us" site_id="retro-tv-wnyxld5-new-york-ny/17849">Retro TV (WNYX-LD5) New York, NY</channel>
+    <channel lang="en" xmltv_id="WOIDT1.us" site_id="abc-woi-des-moines-ia/1245">ABC (WOI) Des Moines, IA</channel>
     <channel lang="en" xmltv_id="WPCWDT1.us" site_id="cw-wpcw-pittsburgh-pa/3187">CW (WPCW) Jeannette, PA</channel>
     <channel lang="en" xmltv_id="WPIXDT1.us" site_id="wpix-new-york-superstation/63">CW (WPIX) New York, NY</channel>
     <channel lang="en" xmltv_id="WPIXDT2.us" site_id="antenna-wpix2-new-york-ny/10745">Antenna (WPIX2) New York, NY</channel>