[SCM] mustang-plug/master: Merge tag 'upstream/1.2'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit b0793ed4592d2ed772b3d13f077f56334504aeae
Merge: c83cebbe4e5d1c61e71d50b4e622d76afcd3146e f35d61a86f4a4198a5638095ec682b8d6313501f
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Sun Apr 26 20:34:57 2015 +0100

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2


-- 
mustang-plug packaging