Merge branch 'hotfix/devise_fix'
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Wed, 10 Apr 2013 20:06:06 +0000 (16:06 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Wed, 10 Apr 2013 20:06:06 +0000 (16:06 -0400)

Trivial merge