Merge pull request #12 from g3d/master

Use Chef::Mixin::DeepMerge to merge params
Keep compatibility with old version

Fixes #13 Refs #7
Merge pull request #14 from hiroponz/keep-compatibility-with-old-version

Keep compatibility with old version
Fix: bundle exec rake gitlab:backup:create RAILS_ENV=production execution

  * bundle exec rake gitlab:backup:create RAILS_ENV=production needs LOCK TABLES rights for gitlab mysql user to backup gitlab DB
Merge pull request #15 from jakshi/master

Fix: bundle exec rake gitlab:backup:create RAILS_ENV=production exec
Support vagrant 1.3.1
Merge branch 'master' of github.com:ogom/cookbook-gitlab
Updated to Gitlab 6.1
Merge pull request #16 from schlamar/patch-1

Updated to Gitlab 6.1