Merge branch 'feature/password_expire' of /home/git/repositories/gitlab/gitlabhq

app/controllers/admin/users_controller.rb

app/controllers/application_controller.rb

app/controllers/passwords_controller.rb

app/models/user.rb

app/views/admin/users/_form.html.haml

app/views/admin/users/show.html.haml

app/views/notify/new_user_email.html.haml

app/views/notify/new_user_email.text.erb

app/views/passwords/new.html.haml

config/routes.rb

db/fixtures/production/001_admin.rb

...igrate/20130613165816_add_password_expires_at_to_users.rb

db/migrate/20130613173246_add_created_by_id_to_user.rb

db/schema.rb

spec/features/admin/admin_users_spec.rb