Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Thu, 4 Apr 2013 23:50:52 +0000 (01:50 +0200)
committertwinaphex <autechre1024@hotmail.com>
Thu, 4 Apr 2013 23:50:52 +0000 (01:50 +0200)

Trivial merge