Merge branch 'master' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Thu, 16 Dec 2010 01:47:38 +0000 (20:47 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Thu, 16 Dec 2010 01:47:38 +0000 (20:47 -0500)
commite13fe53d4d538466329205cdc4652bdfeb7db4d1
treed7fe802df5b4e23774f050ca72b5ad2f9bf81359
parentf8caa7622929c01b4800562af7677df1bb7a2409
parentbf33b619db33fd866decdfb23ea535cdb3f7ef97
Merge branch 'master' into next

Conflicts:
README
app/controllers/application_controller.rb
app/controllers/oauth_controller.rb
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/models/group.rb
app/models/user.rb
config/environment.rb
config/initializers/geoip.rb
config/routes.rb
config/unicorn/unicorn.rb
script/update_geoip
vendor/plugins/open_id_authentication/lib/open_id_authentication/association.rb
vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb
README
app/controllers/users_controller.rb
app/controllers/welcome_controller.rb
app/models/user.rb
app/views/questions/show.html.haml
app/views/users/_form.html.haml
config/unicorn/unicorn.rb