Merge branch 'mzugec-groups' of gitorious.org:opensuse/yast-web-client into mkudlvasr... mkudlvasr-groups
authorMartin Kudlvasr <mkudlvasr@novell.com>
Thu, 25 Mar 2010 17:09:15 +0000 (18:09 +0100)
committerMartin Kudlvasr <mkudlvasr@novell.com>
Thu, 25 Mar 2010 17:09:15 +0000 (18:09 +0100)
commit105d62584a2313c5baffd504428b98df6ec44bea
tree2cbd2f1db5e65153647edf9ce948b3b5d2434fb5
parent49e7d113b1908de067ce1bc1431868b68f10ce89
parent8790013320494e8a2f62ab5d83e282185dfa3f73
Merge branch 'mzugec-groups' of gitorious.org:opensuse/yast-web-client into mkudlvasr-groups

Conflicts:
plugins/users/app/views/groups/show.html.erb
plugins/users/test/fixtures/groups/groups.xml
plugins/users/test/unit/groups_test.rb
plugins/users/test/fixtures/groups/groups.xml
plugins/users/test/unit/groups_test.rb