Merge branch 'users-gagarin3'
authorMichal Zugec <mzugec@suse.cz>
Thu, 22 Apr 2010 07:52:24 +0000 (09:52 +0200)
committerMichal Zugec <mzugec@suse.cz>
Thu, 22 Apr 2010 07:52:24 +0000 (09:52 +0200)
commit2550741c4e386c86f530f77bc1d62e3e248667e6
treec0725c7a4f40f1544da2d6c397d2c4a955c5fda2
parent958edee3feef5f3a7376b022dad637947e87d9e9
parent2e119a346be2aade2a3ed3aeb4e70486557a5d3e
Merge branch 'users-gagarin3'

Conflicts:
plugins/users/app/controllers/users_controller.rb
plugins/users/app/views/users/index.html.erb
plugins/users/app/views/users/new.html.erb
plugins/users/package/webyast-users-ui.changes
plugins/users/public/javascripts/select_dialog.js
plugins/users/public/javascripts/users_edit.js
plugins/users/app/controllers/users_controller.rb
plugins/users/app/views/users/index.html.erb
plugins/users/app/views/users/new.html.erb
plugins/users/package/webyast-users-ui.changes
plugins/users/public/javascripts/group_members.js
plugins/users/public/javascripts/select_dialog.js
plugins/users/public/javascripts/users_edit.js