Merge https://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Sun, 21 Dec 2014 22:19:03 +0000 (23:19 +0100)
committertwinaphex <libretro@gmail.com>
Sun, 21 Dec 2014 22:19:03 +0000 (23:19 +0100)

Trivial merge