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

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

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

The following commit has been merged in the master branch:
commit 13c6f7fd076adbb7624685ee28a3b0b48e4abae5
Merge: c3af585aac2dcac26b708c7012e7460706e1d45d f825e2f9433038e5807237d6e41185fcf1bca9da
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Jun 16 21:16:56 2013 +0200

    Merge tag 'upstream/20130616'
    
    Upstream version 20130616


-- 
x42-plugins packaging