Merge branch 'master' of https://github.com/libretro/pcsx_rearmed into master_merged
authorAlexis PUSKARCZYK <apuskarczyk@IOCEANNT.FR>
Mon, 19 Dec 2016 09:18:15 +0000 (10:18 +0100)
committerAlexis PUSKARCZYK <apuskarczyk@IOCEANNT.FR>
Mon, 19 Dec 2016 09:18:15 +0000 (10:18 +0100)

Trivial merge