Merge branch 'maintenance-webyast-1.0' into tmp/lslezak/bnc_607684
authorLadislav Slezak <lslezak@novell.com>
Thu, 24 Jun 2010 15:27:46 +0000 (17:27 +0200)
committerLadislav Slezak <lslezak@novell.com>
Thu, 24 Jun 2010 15:27:46 +0000 (17:27 +0200)
commit6cf901dbc7f61ea2e44f5af3dee0d814cb8613f1
treecf912e35098116156c4c87e7941690201e879ab4
parent8fd2e74a4fa9f65682b8a504302fa5e19705e7a7
parent36ffb78d321e30a8a45f3f1fae58786278415f09
Merge branch 'maintenance-webyast-1.0' into tmp/lslezak/bnc_607684

Conflicts:
plugins/patch_updates/app/controllers/patch_updates_controller.rb
plugins/patch_updates/package/yast2-webclient-patch_updates.changes
plugins/patch_updates/package/yast2-webclient-patch_updates.spec
plugins/patch_updates/app/controllers/patch_updates_controller.rb
plugins/patch_updates/app/views/patch_updates/_patches.html.erb
plugins/patch_updates/package/yast2-webclient-patch_updates.changes
plugins/patch_updates/package/yast2-webclient-patch_updates.spec