[SCM] dvdstyler/master: Merge tag 'upstream/2.9.2'

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

Imported Upstream version 2.9.2
Imported Upstream version 2.5.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ad3aadeaca149cfad706db8b5bb2e8b196d8f5f3
X-Git-Newrev: 8dacebbda8f15ed6cd8090a0f9b4405cc2188d1d

The following commit has been merged in the master branch:
commit 8198bf0f9ef73324f1668d041e20a87790c9449e
Merge: ad3aadeaca149cfad706db8b5bb2e8b196d8f5f3 4a758b9ac35961ccdd3edb70f4236b1166fdecc7
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Mon Mar 16 17:53:11 2015 -0400

    Merge tag 'upstream/2.9.2'
    
    Upstream version 2.9.2
    
    Conflicts:
    	Makefile.in
    	aclocal.m4
    	backgrounds/Makefile.in
    	buttons/Makefile.in
    	configure
    	data/Makefile.in
    	docs/Makefile.in
    	objects/Makefile.in
    	src/Makefile.in
    	src/rc/Makefile.in
    	templates/Makefile.in
    	wxVillaLib/Makefile.in


-- 
dvdstyler packaging