[SCM] easytag/master: Merge tag 'upstream/2.3.6'

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

Imported Upstream version 2.3.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3cb98aada310affe8732b8ec1403eede269c632d
X-Git-Newrev: 04e1a15efd0beae8b16de9ac8126e38853981b6a

The following commit has been merged in the master branch:
commit 04e1a15efd0beae8b16de9ac8126e38853981b6a
Merge: 3cb98aada310affe8732b8ec1403eede269c632d 2ba4ffae1224e32210ef883c64204e4f4fe3b27a
Author: David King <amigadave at amigadave.com>
Date:   Mon Apr 20 07:49:15 2015 +0100

    Merge tag 'upstream/2.3.6'
    
    Upstream version 2.3.6


-- 
easytag packaging