Merge branch 'master' of gitorious.org:opensuse/yast-rest-service
authorJosef Reidinger <jreidinger@suse.cz>
Thu, 17 Jun 2010 13:17:02 +0000 (15:17 +0200)
committerJosef Reidinger <jreidinger@suse.cz>
Thu, 17 Jun 2010 13:17:02 +0000 (15:17 +0200)
commit2108869d353beaba3f674772ec65f5b38ebfc467
treefa3dcdb270fda439cd8365f00bcb7e150f82be1b
parente5596891c5d8704f39e2560c342af5b9d0ee60aa
parentbd2d82c0f56c7f5009d42f3d6ed54ef0d00a4c17
Merge branch 'master' of gitorious.org:opensuse/yast-rest-service

Conflicts:
plugins/roles/Rakefile
plugins/users/Rakefile
plugins/roles/Rakefile