Merge branch 'maintenance-webyast-1.0' up to commit 'e4657a71cf62749850642ba276125052...
authorMartin Vidner <mvidner@suse.cz>
Tue, 13 Jul 2010 11:35:22 +0000 (13:35 +0200)
committerMartin Vidner <mvidner@suse.cz>
Tue, 13 Jul 2010 11:35:22 +0000 (13:35 +0200)
commit76839d3d57194e890b3505101e4867e56a5fa157
treee9e5b0e46bad1ba8caa008c17ef3e8f2ef41ccd7
parente6cefdba0479a113fe6ec2de5ef87b77dba60aae
parente4657a71cf62749850642ba2761250523a9e99c4
Merge branch 'maintenance-webyast-1.0' up to commit 'e4657a71cf62749850642ba2761250523a9e99c4'

All the changes were already in master.
Conflicts:
plugins/registration/app/models/register.rb
plugins/registration/package/yast2-webservice-registration.changes
plugins/registration/package/yast2-webservice-registration.spec
webservice/package/yast2-webservice.changes
webservice/package/yast2-webservice.spec
webservice/package/yastws