Merge branch 'maintenance-webyast-1.0'
authorLadislav Slezak <lslezak@novell.com>
Wed, 13 Jan 2010 18:14:53 +0000 (19:14 +0100)
committerLadislav Slezak <lslezak@novell.com>
Wed, 13 Jan 2010 18:14:53 +0000 (19:14 +0100)
commit1a8c722c9bc083bc808594fe9316d962538e9441
tree190cbd6d6acbe11b04d8cb4b8ad94765fff9af9c
parent0d073240fa76ac05272da5e5e077ba8accf3c975
parentbbc72b5ac01d979731d19f0a473922da51f79849
Merge branch 'maintenance-webyast-1.0'

Conflicts:
webservice/package/yast2-webservice.changes
webservice/package/yast2-webservice.changes
webservice/package/yast2-webservice.spec