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

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

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

The following commit has been merged in the master branch:
commit 62fbebc62c29f3e162d40b7ee795ccf2046bb978
Merge: cb9ed629e78213839ef2ef6f06b9859e0d0fbf9c 96db6d121600b2570d80782c51d067204dfd51b3
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Oct 23 21:58:32 2013 +0200

    Merge tag 'upstream/20131021'
    
    Upstream version 20131021


-- 
x42-plugins packaging