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

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

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

The following commit has been merged in the master branch:
commit d5370b8b5e0a0cbc32f29d21a9d6edc5c0eb4fbd
Merge: eda749a2ee1b07d59d15fe55731c48a895c4a62f 85755703b8bf27499f71dec48c6ed55dd2fa9aee
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jun 9 03:08:16 2015 +0200

    Merge tag 'upstream/20150608'
    
    Upstream version 20150608


-- 
x42-plugins packaging