Merge remote-tracking branch 'gitorious-shapado/new-ui-login' into new-ui
authorJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 03:19:08 +0000 (22:19 -0500)
committerJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 03:19:08 +0000 (22:19 -0500)
commit2e47158770922536d441dcc4c657b36d46ee573a
tree046e463db1d5f9ef7b7d5aed65df1f2f7b18f98f
parent91be0b518cd530fa7d3d690e253c57b40de342c0
parent1ff601e03505075ddf54b6977882b5e159a67ccc
Merge remote-tracking branch 'gitorious-shapado/new-ui-login' into new-ui

Conflicts:
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb