[mame-extra] 03/03: Merge branch 'upstream'

[Jordi Mallach]

This is an automated email from the git hooks/post-receive script.

jordi pushed a commit to branch master
in repository mame-extra.

commit 2afc319e0af0df0024c68cf3ed42bfe5d4821c55
Merge: 6727d3e 878d408
Author: Jordi Mallach <jordi at debian.org>
Date:   Mon Dec 26 18:43:24 2016 +0100

    Merge branch 'upstream'

 history/history.dat        | 1073227 +++++++++++++++++++++++++++++++++++++++++
 nplayers/docs/nplayers.txt |     322 +
 nplayers/nplayers.ini      |   36638 ++
 3 files changed, 1110187 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame-extra.git