[SCM] ffdiaporama/master: Merge tag 'upstream/1.4'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit bc4bfc5954ed4baab99228a5756bb9167fdc6537
Merge: b8ba2355cc84ee6749869b13999bc639411e029d 0b98ddda649b52228f372d88190f284f074a5f27
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Nov 15 18:09:03 2012 +0000

    Merge tag 'upstream/1.4'
    
    Upstream version 1.4


-- 
ffdiaporama packaging