Let's get explicit
Merge branch 'master' of github.com:PonyEdit/PonyEdit