[SCM] easytag/master: Merge branch 'upstream'

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

Imported Upstream version 2.2.1
Imported Upstream version 2.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: 56f8b78f982a35d5d7cca0b351baaf59a4dadece
X-Git-Newrev: 7d0ecdda5a821822b0a2934d4028bf18c00f742a

The following commit has been merged in the master branch:
commit 8782500f7fa347e5df685457a4ff334ae3a6174d
Merge: 56f8b78f982a35d5d7cca0b351baaf59a4dadece 291f178d0ad6f95bd6a1c0639bc0c6574ed2e687
Author: David King <amigadave at amigadave.com>
Date:   Wed Apr 23 09:08:56 2014 +0100

    Merge branch 'upstream'
    
    Conflicts:
    	ChangeLog
    	NEWS
    	README
    	configure
    	configure.ac
    	po/hu.po
    	po/lt.po
    	po/pt_BR.po
    	src/gio_wrapper.cc
    	src/gio_wrapper.h
    	src/ogg_tag.h
    	src/scan.c
    	src/scan_dialog.c
    	src/scan_dialog.h


-- 
easytag packaging