Merge pull request #11 from notaz/upstream_merge
authorTwinaphex <libretro@gmail.com>
Sat, 20 Dec 2014 19:43:18 +0000 (20:43 +0100)
committerTwinaphex <libretro@gmail.com>
Sat, 20 Dec 2014 19:43:18 +0000 (20:43 +0100)
commit247fc699be6b3bd95fd9126541e0804cc8dffdd4
treed38e169e68e48a3ccbf8a3805f9cb87197ed894a
parent3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666
parent7931825ed8ef51dab3e37475d8126103ebc9fb6f
Merge pull request #11 from notaz/upstream_merge

Upstream merge