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

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

Imported Upstream version 20150702
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d71ff79728c3d8d67e8c7ee7e81aa5df19878881
X-Git-Newrev: 59dbe2e79df84fa8ac9ba55f2e93dfe64f92a430

The following commit has been merged in the master branch:
commit e7e10b677bf8a43dc5d9d31da2a8744934237554
Merge: d71ff79728c3d8d67e8c7ee7e81aa5df19878881 5a351fc32f69323e6fa82357b1317a11677f1a53
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jul 7 12:10:28 2015 +0200

    Merge tag 'upstream/20150702'
    
    Upstream version 20150702


-- 
x42-plugins packaging