Merge branch 'next' into feature/rails3
authorChristian Johansen <christian@gitorious.com>
Tue, 20 Nov 2012 09:07:11 +0000 (10:07 +0100)
committerChristian Johansen <christian@gitorious.com>
Tue, 20 Nov 2012 09:07:11 +0000 (10:07 +0100)
commit8eda1a5202565c627573de7d5e65e80aa37d7697
treea41829799d41af0fc09ad5e28ed4381870c75174
parent452c295cfac046e0dc320bf443c121b84ca7f899
parent1b43e83a405a9ce2eabab265f3ad5eab6622412d
Merge branch 'next' into feature/rails3

Conflicts:
test/unit/team_test.rb
app/controllers/groups_controller.rb
app/helpers/application_helper.rb
app/models/finders/group_finder.rb
app/models/finders/ldap_group_finder.rb
test/functional/groups_controller_test.rb
test/unit/helpers/application_helper_test.rb
test/unit/team_test.rb