Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Sun, 26 May 2013 17:01:47 +0000 (19:01 +0200)
committertwinaphex <autechre1024@hotmail.com>
Sun, 26 May 2013 17:01:47 +0000 (19:01 +0200)

Trivial merge