[SCM] libgroove/master: Merge tag 'upstream/4.2.0'

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

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

The following commit has been merged in the master branch:
commit fb402c50786b50d88ff6726163489317fca4c8f7
Merge: 3690055ff2c44da6e17f58ac423aef2efab22f4b 2b854c2d766aefa90a07706504bdf65016bdf8a2
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sun Sep 28 23:15:52 2014 +0000

    Merge tag 'upstream/4.2.0'
    
    Upstream version 4.2.0


-- 
libgroove packaging