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

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

Imported Upstream version 20150530
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 344f883de959a8cf3fe00e46b3ef66f20eda307b
X-Git-Newrev: 3d45f9d7d9ed6a967da6c1f1b2481e29a6871db0

The following commit has been merged in the master branch:
commit 3d45f9d7d9ed6a967da6c1f1b2481e29a6871db0
Merge: 344f883de959a8cf3fe00e46b3ef66f20eda307b 897f39d662d12d5bacf0bbdefac9844dc70c73a3
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun May 31 21:58:47 2015 +0200

    Merge tag 'upstream/20150530'
    
    Upstream version 20150530


-- 
x42-plugins packaging