Merge branch 'maintenance-webyast-1.0' up to commit '0259430936050d5d87cae7a8cbc41a89...
authorMartin Vidner <mvidner@suse.cz>
Tue, 13 Jul 2010 10:40:49 +0000 (12:40 +0200)
committerMartin Vidner <mvidner@suse.cz>
Tue, 13 Jul 2010 10:40:49 +0000 (12:40 +0200)
commite6cefdba0479a113fe6ec2de5ef87b77dba60aae
treee9e5b0e46bad1ba8caa008c17ef3e8f2ef41ccd7
parent827e34ed56430eb002b4950c8298db2f632e9681
parent0259430936050d5d87cae7a8cbc41a89cc2a52a1
Merge branch 'maintenance-webyast-1.0' up to commit '0259430936050d5d87cae7a8cbc41a89cc2a52a1'

Conflicts:
plugins/patches/app/models/patch.rb
plugins/patches/package/yast2-webservice-patches.changes
plugins/patches/package/yast2-webservice-patches.spec
plugins/software/app/controllers/patches_controller.rb
plugins/software/app/controllers/patches_controller.rb