Merge remote-tracking branch 'libretro/master'
authoralexis-puska <a.puska@ile-noire.com>
Sun, 31 Jul 2016 13:05:09 +0000 (15:05 +0200)
committeralexis-puska <a.puska@ile-noire.com>
Sun, 31 Jul 2016 13:05:09 +0000 (15:05 +0200)

Trivial merge