[SCM] freetuxtv/master: Merge branch 'upstream (0.6.8)' into dfsg_clean

[ebeuque-guest at users.alioth.debian.org]

Imported Upstream version 0.6.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a3391d9476d12f71132384aa89efd95c4ea32f80
X-Git-Newrev: 47142a6516777be26b6fd67530f8c14035c72256

The following commit has been merged in the master branch:
commit ba6a6d9448c96095830e3847145e020de15b7f6d
Merge: d98375345845a203914611585e72745714c2920e 428544e0d12e0e0f0c468ad1461910cc01d48252
Author: Eric Beuque <eric.beuque at gmail.com>
Date:   Tue May 24 18:45:11 2016 +0200

    Merge branch 'upstream (0.6.8)' into dfsg_clean


-- 
freetuxtv packaging