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)
commitad87f67868e277bc0fde21bfd6c7625a570ecded
tree7b2d5727ae4cb5bba44094d9b984bac3f78f43cb
parentb9e6610ef5fe9cb8dd5081dc27cd62b0f62bbe8b
parent841bd1e14925683e055ab1633cbbb59b9f99faef
Merge branch 'hotfix/devise_fix'