Merge branch 'master' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Nov 2010 05:50:08 +0000 (00:50 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Nov 2010 05:50:08 +0000 (00:50 -0500)
commit50ef99124312ba484062712d6a5e9237657ec222
treee706441534daf7cf2288e8d5367fc793dceb103a
parentb31ba7aec144b1e2e958ee0af27161dbc54dd81f
parent658ac45b4bc4e75de62ac62d3fa75d3adf77d609
Merge branch 'master' into next

Conflicts:
.gitignore
app/controllers/application_controller.rb
app/models/draft.rb
app/models/notifier.rb
app/views/layouts/notifications.text.html.haml
app/views/layouts/notifications.text.plain.haml
app/views/notifier/give_advice.text.html.haml
app/views/notifier/give_advice.text.plain.haml
config/initializers/new_rails_defaults.rb
config/locales/devise/devise.en.yml
config/locales/widgets/en.yml
17 files changed:
.gitignore
app/models/draft.rb
app/views/notifier/earned_badge.text.haml
app/views/notifier/favorited.text.haml
app/views/notifier/follow.text.haml
app/views/notifier/new_answer.text.haml
app/views/notifier/new_answer.text.html.haml
app/views/notifier/new_comment.text.haml
app/views/notifier/new_comment.text.html.haml
app/views/notifier/report.text.haml
app/views/shared/layout/_footer.html.haml
config/initializers/00_config.rb
config/locales/devise/devise.en.yml
config/locales/widgets/en.yml
config/unicorn/bluepill.rb
script/cleanup
script/daily_report