Merge https://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Sat, 4 Apr 2015 17:17:58 +0000 (19:17 +0200)
committertwinaphex <libretro@gmail.com>
Sat, 4 Apr 2015 17:17:58 +0000 (19:17 +0200)

Trivial merge