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

app/mailers/devise_mailer.rb

app/mailers/emails/projects.rb

app/mailers/notify.rb

config/gitlab.teatro.yml

config/gitlab.yml.example

config/initializers/1_settings.rb

config/initializers/disable_email_interceptor.rb

config/initializers/email_settings.rb

config/initializers/smtp_settings.rb.sample

lib/tasks/gitlab/check.rake

spec/mailers/notify_spec.rb