Merge branch 'master' of github.com:gitlabhq/gitlabhq

Conflicts:
	resque.sh

resque.sh

-mkdir tmp/pids
+mkdir -p tmp/pids
 bundle exec rake environment resque:work QUEUE=post_receive RAILS_ENV=production PIDFILE=tmp/pids/resque_worker.pid BACKGROUND=yes