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

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

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

The following commit has been merged in the master branch:
commit 462d0b4d633fed651508ce4945dacdb4b9e94dd4
Merge: fcabd0b32cd4116032280485b4cc514b3a86355b 5466276481ed86cd66509db4f48d1f18ed1aaa8b
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Jan 18 17:03:34 2014 +0100

    Merge tag 'upstream/20140115'
    
    Upstream version 20140115


-- 
x42-plugins packaging