Fix merge conflicts
Merge branch 'master' of git://github.com/cegeka/puppet-mysql
Modified mysql type and provider for database/grant/user due to constant applying of grants
Merge pull request #15 from dieterdemeyer/master

Modified mysql type and provider for database/grant/user due to constant applying of grants