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

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

Imported Upstream version 0.6.6
Imported Upstream version 0.6.6
Imported Upstream version 0.6.6
Imported Upstream version 0.6.6
Imported Upstream version 0.6.6
Imported Upstream version 0.6.6
Imported Upstream version 0.6.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/dfsg_clean
X-Git-Reftype: branch
X-Git-Oldrev: 402051584946398622d84c18a9e61347640e5eca
X-Git-Newrev: 5d296ce8e29eea69af4dcf9724bd31fe474de34e

The following commit has been merged in the dfsg_clean branch:
commit 5d296ce8e29eea69af4dcf9724bd31fe474de34e
Merge: 402051584946398622d84c18a9e61347640e5eca b103e3b6f6d62f0c22f7a6b76a3cc88f107812ec
Author: Eric Beuque <ebeuque at debian32>
Date:   Tue Jul 29 20:00:10 2014 +0200

    Merge branch 'upstream' (0.6.6) into dfsg_clean


-- 
freetuxtv packaging