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

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

Imported Upstream version 2.0.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: 5efd235041a1a94527d2a7987116e3ac0d8a2528
X-Git-Newrev: a35a44e5c218c7f7019113a7e1f629e7e6b17c4c

The following commit has been merged in the master branch:
commit a35a44e5c218c7f7019113a7e1f629e7e6b17c4c
Merge: 5efd235041a1a94527d2a7987116e3ac0d8a2528 92ae4a0fd0184c64c0c76525716ad5c545c75c93
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Tue Apr 19 11:21:41 2016 +0200

    Merge tag 'upstream/2.0.1'
    
    Upstream version 2.0.1


-- 
ffdiaporama packaging