[SCM] groovebasin/master: Merge tag 'upstream/1.4.0'

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

Imported Upstream version 1.4.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: 0b2714ca1a4551440218a325b37c2ba6c7694151
X-Git-Newrev: c11002ee0aa0e2d8dc6b89487c9a70444d7d39f0

The following commit has been merged in the master branch:
commit a06c32b2993e9c6342d1ea2c9c11a721c991af78
Merge: def78297e5e0148d072e9afcc7150cd730a1ad9d 0ec87b5391b12f1fa65e3bdea68e4b3867e55cde
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Fri Oct 17 06:04:01 2014 +0000

    Merge tag 'upstream/1.4.0'
    
    Upstream version 1.4.0
    
    # gpg: Signature made Fri 17 Oct 2014 06:03:58 AM UTC using RSA key ID 6D58AAC8
    # gpg: Good signature from "Andrew Kelley <superjoe30 at gmail.com>"


-- 
groovebasin packaging