Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service
authorMartin Kudlvasr <mkudlvasr@suse.cz>
Tue, 27 Oct 2009 13:36:33 +0000 (14:36 +0100)
committerMartin Kudlvasr <mkudlvasr@suse.cz>
Tue, 27 Oct 2009 13:36:33 +0000 (14:36 +0100)
commit02a23a7784733e515ab2534c41dd4331b506494d
tree2938a51a49925917f5016e76f812606f5c452af7
parent264b38c96a1372755a88b6fd0d763910e8b9ff3b
parentd6b3f9c2506d4832d451e2a81df09ba25bbb7b2c
Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service

Conflicts:
plugins/eulas/package/yast2-webservice-eulas.changes