[SCM] ffdiaporama/master: Merge branch 'upstream'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 6dbd1e06e32952c7fd5f5f122099a85c7a08aa76
Merge: efac8c0bce2a57a43e0f9a12876d9b940e9a907f 1d2bc0f2c7526c1b8791bd27036613ab0ab23f4a
Author: Alessio Treglia <alessio at Aspire-1410>
Date:   Mon Jul 16 09:20:54 2012 +0200

    Merge branch 'upstream'


-- 
ffdiaporama packaging