Merge branch 'master' of github.com:Askelon/wpmovielibrary into svn
Merge pull request #54 from Askelon/svn

Merge branch 'master' of github.com:Askelon/wpmovielibrary into svn