Merge remote-tracking branch 'origin/fixes-kuadrosx'
authorDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Aug 2011 23:35:13 +0000 (18:35 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Aug 2011 23:35:13 +0000 (18:35 -0500)
commit4fc1b569337dff66977642f30d72d6b87a59fbb5
tree9392aa7cf3b2f69526337a0bfc827bf5538281d1
parent50af1a007a6993704a78261858f194c392d95946
parent46468bc072b49aaee2098537ae39960f73f5f742
Merge remote-tracking branch 'origin/fixes-kuadrosx'

Conflicts:
app/controllers/users_controller.rb
app/controllers/users_controller.rb