Merge branch 'master' of github.com:boundy/Chef-CentOS6
Merge branch 'master' of github.com:boundy/Chef-CentOS6
rejected one before modify on .gitignore