[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
Revert "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: cc140a77a28bd0617cf37ac4c9b8188ce1a7881f
X-Git-Newrev: d98375345845a203914611585e72745714c2920e

The following commit has been merged in the dfsg_clean branch:
commit d98375345845a203914611585e72745714c2920e
Merge: cc140a77a28bd0617cf37ac4c9b8188ce1a7881f cdbea10e21fb8d08d0d9782671fc6eb3f2f2cd72
Author: Eric Beuque <eric.beuque at gmail.com>
Date:   Sun Aug 3 12:19:47 2014 +0200

    Merge branch 'upstream' (0.6.6) into dfsg_clean


-- 
freetuxtv packaging