Merge branch 'upstream' into libretro
authornotaz <notasas@gmail.com>
Thu, 5 Feb 2015 23:29:00 +0000 (01:29 +0200)
committernotaz <notasas@gmail.com>
Thu, 5 Feb 2015 23:29:00 +0000 (01:29 +0200)

Trivial merge