[dtv-scan-tables] 04/05: Merge tag 'upstream/0+git20130622.edc0bc3'

[Jonathan McCrohan]

This is an automated email from the git hooks/post-receive script.

jmccrohan-guest pushed a commit to branch master
in repository dtv-scan-tables.

commit aa83c76508a2b24ec58685da90fd100b70267f56
Merge: 7978d8f d01de06
Author: Jonathan McCrohan <jmccrohan at gmail.com>
Date:   Wed Aug 7 00:18:16 2013 +0100

    Merge tag 'upstream/0+git20130622.edc0bc3'
    
    Upstream version 0+git20130622.edc0bc3

 channels-conf/dvb-t/tw-All  |   21 +++++++++++++
 dvb-c/de-Kabel_BW           |    2 +-
 dvb-c/de-NetAachen          |   47 +++++++++++++++++++++++++++++
 dvb-c/de-Primacom           |   69 +++++++++++++++++++++++++------------------
 dvb-s/Astra-31.5E           |    8 +++++
 dvb-s/Atlantic-Bird-1-12.5W |    9 ++++--
 dvb-s/Atlantic-Bird-3-5.0W  |   35 ++++++++++++++++++++--
 dvb-s/Hotbird-13.0E         |    9 ++++--
 dvb-s/Intelsat-12-45.0E     |   13 ++++++++
 dvb-t/at-All                |   53 +++++++++++++++++++++++++++++++++
 dvb-t/at-Official           |   24 ---------------
 dvb-t/bg-Sofia              |   16 ++++++++++
 dvb-t/fr-All                |   42 ++++++++++++++++++++++++++
 dvb-t/fr-Bordeaux           |    9 ------
 dvb-t/ru-Krasnodar          |    6 ++++
 dvb-t/ru-Novosibirsk        |    6 ++++
 dvb-t/ru-Volgodonsk         |    6 ++++
 dvb-t/tw-All                |   11 +++++++
 dvb-t/tw-Kaohsiung          |    6 ----
 dvb-t/tw-Taipei             |    7 -----
 dvb-t/ua-Kharkov            |    6 ++++
 dvb-t/ua-Kiev               |    6 ++++
 dvb-t/ua-Lozovaya           |    6 ++++
 dvb-t/ua-Odessa             |    6 ++++
 24 files changed, 340 insertions(+), 83 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/dtv-scan-tables.git