[mupen64plus-core] 290/310: Merge branch 'master' into experimental

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit d5681a7a544dabb83165b758c7bcef4587293626
Merge: da3cfc4 9c98d8b
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Sep 5 22:13:18 2014 +0200

    Merge branch 'master' into experimental

 debian/backports/precise | 6 ++++++
 debian/backports/trusty  | 6 ++++++
 2 files changed, 12 insertions(+)

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