Merge pull request #85 from alexis-puska/master_merged
authorTwinaphex <libretro@gmail.com>
Mon, 19 Dec 2016 21:47:05 +0000 (22:47 +0100)
committerGitHub <noreply@github.com>
Mon, 19 Dec 2016 21:47:05 +0000 (22:47 +0100)
commit17b93a2844f026f8f0d779e9bae698631c746f8a
treeeb66251ede2a049684ca75bc370ba893464978cb
parent30373a821c80e223d5c592ccce95377ff57b4998
parent8342a30082638cc032c53e073f893e82f149fcb7
Merge pull request #85 from alexis-puska/master_merged

Master merged