Merge pull request #1397 from jarbowski/master

Hatari
This commit is contained in:
Juan RP 2015-04-24 22:24:12 +02:00
commit 190a1ce402