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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.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: fd78b5d240fe6b2f25f2b9c42889a827a04d63a0
X-Git-Newrev: 7a004fdfb0cdb4a0d41d9f00f1653329201e7052

The following commit has been merged in the master branch:
commit 7a004fdfb0cdb4a0d41d9f00f1653329201e7052
Merge: fd78b5d240fe6b2f25f2b9c42889a827a04d63a0 c6e82103ade23c7113c7c5a2c92354f38790f4a8
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Oct 7 15:08:55 2013 +0100

    Merge tag 'upstream/1.6'
    
    Upstream version 1.6


-- 
ffdiaporama packaging