From: twinaphex <libretro@gmail.com>
Date: Fri, 5 Apr 2013 00:56:55 +0000 (+0200)
Subject: Merge git://github.com/notaz/pcsx_rearmed
X-Git-Tag: r24l~947
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beef357e370a426ae48298223f471176e329aa9a;p=pcsx_rearmed.git

Merge git://github.com/notaz/pcsx_rearmed
---

beef357e370a426ae48298223f471176e329aa9a