Merge branch 'maintenance-webyast-1.0' up to commit 'c06399716fa54e239b40ce482d4fc10d...
authorMartin Vidner <mvidner@suse.cz>
Tue, 20 Jul 2010 06:56:52 +0000 (08:56 +0200)
committerMartin Vidner <mvidner@suse.cz>
Tue, 20 Jul 2010 06:56:52 +0000 (08:56 +0200)
commit305cf97bf4d759d829a27761ee17d656033544a7
tree6536fdb2d48d3eeffc9c1141e0f850978b87d8ed
parent3792eebc02e60a089749a6834e5cd8554de8b11b
parentc06399716fa54e239b40ce482d4fc10d1698462f
Merge branch 'maintenance-webyast-1.0' up to commit 'c06399716fa54e239b40ce482d4fc10d1698462f'

Conflicts:
plugins/patch_updates/app/views/patch_updates/_patches.html.erb
webclient/app/helpers/view_helpers/html_helper.rb
webclient/package/yast2-webclient.changes
plugins/software/app/views/patch_updates/_patches.html.erb
webclient/package/webyast-base-ui.changes