Merge branch 'upstream' into libretro
authornotaz <notasas@gmail.com>
Sun, 25 Jan 2015 21:21:40 +0000 (23:21 +0200)
committernotaz <notasas@gmail.com>
Sun, 25 Jan 2015 21:21:40 +0000 (23:21 +0200)

Trivial merge