Merge remote-tracking branch 'origin/networks'
authorDavid A. Cuadrado <krawek@gmail.com>
Thu, 30 Jun 2011 17:10:53 +0000 (12:10 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Thu, 30 Jun 2011 17:10:53 +0000 (12:10 -0500)
commit9a6d1d05b36dbc99eb988f0d73349240a59ec362
tree92cad78017a945f650862eba7338d11e582ef7e1
parentfb1891422e8975ebce32437e4ccee2471b806d37
parent4cb5a34044468e7105701fc34923fa27cd00d39f
Merge remote-tracking branch 'origin/networks'

Conflicts:
Gemfile.lock
public/javascripts/app/initializers/assets_dev.js
Gemfile.lock
app/controllers/application_controller.rb
app/controllers/users_controller.rb
app/models/user.rb
config/assets.yml
public/javascripts/app/initializers/assets_dev.js