Merge remote branch 'origin/master' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sun, 26 Sep 2010 02:34:34 +0000 (21:34 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sun, 26 Sep 2010 02:34:34 +0000 (21:34 -0500)
commit43c2bbd569274be1d0f143c115e5569bff330307
tree2a05327a2a115c6e2af45e22a83b469af3d44be1
parent7430616c83016c25fec52e296e9bc035b2f94d48
parenta99bad21332582546d328f6fe4adc54ba24a66f4
Merge remote branch 'origin/master' into next

Conflicts:
config/environment.rb
app/models/user.rb
config/initializers/00_config.rb