Merge branch 'maintenance-webyast-1.0' up to commit '8032e8d680bfc53c5bdcdaf6e0e7d380...
authorMartin Vidner <mvidner@suse.cz>
Tue, 20 Jul 2010 08:12:59 +0000 (10:12 +0200)
committerMartin Vidner <mvidner@suse.cz>
Tue, 20 Jul 2010 08:12:59 +0000 (10:12 +0200)
commitf2514d841624f9b3b516194d28f7b8a2a944898e
tree397cbc943f5865d62f7effcbb1cca9a5fad39936
parent305cf97bf4d759d829a27761ee17d656033544a7
parent8032e8d680bfc53c5bdcdaf6e0e7d380e5e58acb
Merge branch 'maintenance-webyast-1.0' up to commit '8032e8d680bfc53c5bdcdaf6e0e7d380e5e58acb'

Regarding ce620eed367b82fc7ed8539324e624e725e4b72d, schubi says
it was a special hack for 1.0 only. This issue is solved in 1.1 by another way

Conflicts:
plugins/patch_updates/app/controllers/patch_updates_controller.rb
plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb
plugins/patch_updates/package/yast2-webclient-patch_updates.changes
plugins/patch_updates/package/yast2-webclient-patch_updates.spec
webclient/package/yast2-webclient.changes
webclient/package/yast2-webclient.spec
webclient/package/yastwc
plugins/software/package/webyast-software-ui.changes