Merge remote branch 'origin/next' into next-images
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Sat, 2 Apr 2011 02:54:10 +0000 (21:54 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Sat, 2 Apr 2011 02:54:10 +0000 (21:54 -0500)
commit709fd394051068d9be3c0e043b6464967ca0c566
tree8c79554b86231eb076e32c82182945d4fbf48372
parent729e6d5803434e2e9aaedc75c770d32960f870d2
parent04df6bbab88bc18824df5d8716160d4fdfa27534
Merge remote branch 'origin/next' into next-images
app/controllers/groups_controller.rb
app/models/group.rb
app/models/user.rb