[SCM] freetuxtv/master: Merge tag 'dfsg_clean/0.6.6'

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

Merge branch 'upstream' (0.6.6) into dfsg_clean
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/master
X-Git-Reftype: branch
X-Git-Oldrev: d2d8a2c7c7a311ed5680cd4762770fdaed24b0e0
X-Git-Newrev: 751da6e9b93a58e750213d854047f3356c70caac

The following commit has been merged in the master branch:
commit e9b98091b5f9f94b7fd9c5cc3ae72f001558e4fd
Merge: d2d8a2c7c7a311ed5680cd4762770fdaed24b0e0 5d296ce8e29eea69af4dcf9724bd31fe474de34e
Author: Eric Beuque <ebeuque at debian32>
Date:   Tue Jul 29 20:11:33 2014 +0200

    Merge tag 'dfsg_clean/0.6.6'
    
    Merge tag 'dfsg_clean/0.6.6'


-- 
freetuxtv packaging