[SCM] MAME / MESS Catalog / Launcher II branch, master, updated. debian/0.2.b19-1-4-gabc6a9d

[Thomas Maass]

The following commit has been merged in the master branch:
commit 955c30c4e68c651835a82713efeebc880b41599d
Merge: 0f90d8e7ce0ef18bc7a79f1dba083fe18287ff2e 05f8b4f854b1550b005c330dd71ee77e524fa04d
Author: Thomas Maass <mase at setho.org>
Date:   Sat Nov 26 14:50:23 2011 +0100

    Merge commit 'upstream/0.34'
    
    Conflicts:
    	data/doc/html/de/img
    	data/doc/html/fr/img
    	data/doc/html/pl/img
    	data/doc/html/pt/img


-- 
MAME / MESS Catalog / Launcher II