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

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

Imported Upstream version 20140524
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 16a3cacd135fd30b29f931c6423d7f918970f314
X-Git-Newrev: 66c6d820e13dffa0b7d7be44c0703dfa79a91c7e

The following commit has been merged in the master branch:
commit 66c6d820e13dffa0b7d7be44c0703dfa79a91c7e
Merge: 16a3cacd135fd30b29f931c6423d7f918970f314 38e2f616094f6bf8ca0f45dda03768459e5d56da
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Jun 5 22:51:05 2014 +0200

    Merge tag 'upstream/20140524'
    
    Upstream version 20140524


-- 
x42-plugins packaging