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

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

Imported Upstream version 20130915
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0f969bf9bcc779b882003ec5f8760fd92ee2e011
X-Git-Newrev: 8158d997fe2e678ab5d87039f44da8700c5d9c52

The following commit has been merged in the master branch:
commit 8158d997fe2e678ab5d87039f44da8700c5d9c52
Merge: 0f969bf9bcc779b882003ec5f8760fd92ee2e011 896541dad87f85d1cf730a3244dc24972f58bf74
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Sep 15 21:36:34 2013 +0200

    Merge tag 'upstream/20130915'
    
    Upstream version 20130915


-- 
x42-plugins packaging