misc: merge from pcsxr r86908
authornotaz <notasas@gmail.com>
Sun, 21 Dec 2014 17:03:56 +0000 (19:03 +0200)
committernotaz <notasas@gmail.com>
Sun, 21 Dec 2014 17:03:56 +0000 (19:03 +0200)
Author: edgbla
CdromId fix;


No differences found