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

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

Imported Upstream version 1.3.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6dbd1e06e32952c7fd5f5f122099a85c7a08aa76
X-Git-Newrev: 9804dfe9b681b7a70f5bb2093fa793bc45996e2e

The following commit has been merged in the master branch:
commit 1da28def66c23e8d53a29e331927dbe8751721dd
Merge: 6dbd1e06e32952c7fd5f5f122099a85c7a08aa76 8f4a266038d6f521caba0bdfbba4635065db6175
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Mon Jul 16 20:00:10 2012 +0200

    Merge tag 'upstream/1.3.1'
    
    Upstream version 1.3.1


-- 
ffdiaporama packaging