Merge https://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Wed, 31 Dec 2014 10:43:39 +0000 (11:43 +0100)
committertwinaphex <libretro@gmail.com>
Wed, 31 Dec 2014 10:43:39 +0000 (11:43 +0100)

Trivial merge