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

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

Imported Upstream version 0.6.5
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: e62785ced10de19d04b72bbbaa7c96de410694ff
X-Git-Newrev: 402051584946398622d84c18a9e61347640e5eca

The following commit has been merged in the dfsg_clean branch:
commit 402051584946398622d84c18a9e61347640e5eca
Merge: e62785ced10de19d04b72bbbaa7c96de410694ff f6fcf0a4ea0703edec839fa2530a7387f186d20d
Author: Eric Beuque <eric.beuque at gmail.com>
Date:   Wed May 9 21:47:42 2012 +0200

    Merge branch 'upstream' (0.6.5) into dfsg_clean


-- 
freetuxtv packaging