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

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

Imported Upstream version 1.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 650a78ec9285d6ac80c418d67fa71a3909ff4eb4
X-Git-Newrev: 40cf82683eb0f9f4d9f442e84c969c9c3d5f178c

The following commit has been merged in the master branch:
commit 9dde636304b248e31c174b0c1a3157b2a7591a4a
Merge: 650a78ec9285d6ac80c418d67fa71a3909ff4eb4 5492d1d1a88bb13ebabc4606fcd416dbb39cab7a
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Mon Nov 26 19:08:42 2012 +0100

    Merge tag 'upstream/1.5'
    
    Upstream version 1.5


-- 
ffdiaporama packaging