[dtv-scan-tables] 04/05: Merge tag 'upstream/0+git20151202.3864e0a'

[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 534bec0f2c0956aceaa15bc0ce23b690be715f48
Merge: a20a242 e7855f4
Author: Jonathan McCrohan <jmccrohan at gmail.com>
Date:   Mon Jan 18 00:32:46 2016 +0000

    Merge tag 'upstream/0+git20151202.3864e0a'
    
    Upstream version 0+git20151202.3864e0a


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