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

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

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

The following commit has been merged in the master branch:
commit 2d5362b3ed8120f0884de59170408c73ae11c642
Merge: 4cda1a4b0c2355e44815849b54a9eaf8d653de30 29c44dd6a8dacee66428b634cdb30caabe2a7f23
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Tue Oct 7 17:42:49 2014 +0000

    Merge tag 'upstream/4.2.1'
    
    Upstream version 4.2.1
    
    # gpg: Signature made Tue 07 Oct 2014 05:42:46 PM UTC using RSA key ID 6D58AAC8
    # gpg: Good signature from "Andrew Kelley <superjoe30 at gmail.com>"


-- 
libgroove packaging