From: dankcushions <chris.bransden@gmail.com>
Date: Fri, 22 Apr 2016 14:05:41 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/notaz/pcsx_rearmed into notaz-master
X-Git-Tag: r24l~857^2^2
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb4d282af668df3bdbd428be5a5ad26996cd0f4f;p=pcsx_rearmed.git

Merge branch 'master' of https://github.com/notaz/pcsx_rearmed into notaz-master
---

cb4d282af668df3bdbd428be5a5ad26996cd0f4f