[SCM] gsequencer/master: Merge tag 'upstream/0.4.2-69'

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

Imported Upstream version 0.4.2-69
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6fa7282c9604c1fc81b682376a9bcfd54c67ac6
X-Git-Newrev: 1596e00d281fda2ee16194bf2212fd230c674322

The following commit has been merged in the master branch:
commit 4aac6c7e7d2848eb6a10e1e10dd08ba29780c66d
Merge: dc8632a3837be056dc98c7e0d9ac571e8e17442e c954bc43a6ef1ca002abefcb1c7c474c2ee1d2a2
Author: Joël Krähemann <jkraehemann at gmail.com>
Date:   Fri Jun 19 17:53:32 2015 +0200

    Merge tag 'upstream/0.4.2-69'
    
    Upstream version 0.4.2-69
    
    Conflicts:
    	Makefile.am
    	Makefile.in
    	configure
    	configure.ac


-- 
gsequencer packaging