From: Twinaphex <libretro@gmail.com>
Date: Sat, 20 Dec 2014 19:43:18 +0000 (+0100)
Subject: Merge pull request #11 from notaz/upstream_merge
X-Git-Tag: r24l~893
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=247fc699be6b3bd95fd9126541e0804cc8dffdd4;p=pcsx_rearmed.git

Merge pull request #11 from notaz/upstream_merge

Upstream merge
---

247fc699be6b3bd95fd9126541e0804cc8dffdd4