[SCM] x42-plugins/master: Merge tag 'upstream/20160822'

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

Imported Upstream version 20160822
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b6db0831d9c439789d55e19d46e6bfd6ea4d600f
X-Git-Newrev: 1948a9f9f8f8f6c71fd1b97960e0f221389f822c

The following commit has been merged in the master branch:
commit 1948a9f9f8f8f6c71fd1b97960e0f221389f822c
Merge: b6db0831d9c439789d55e19d46e6bfd6ea4d600f 1bc405ef229ab40936311f606f0afbb5de2b15cf
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Aug 25 12:57:01 2016 +0200

    Merge tag 'upstream/20160822'
    
    Upstream version 20160822


-- 
x42-plugins packaging