[SCM] libgroove/ubuntu: Merge branch 'master' into ubuntu

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

The following commit has been merged in the ubuntu branch:
commit ca69bbb8aeee1f1672e709d3b3444046a43aecf1
Merge: 4894d12eac4915842b386ce3445ff4f9dc7db5a5 4e7aff49890d4ef1ed6dc0a91a974692e4eac39d
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sat May 31 12:13:24 2014 -0700

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog


-- 
libgroove packaging