Merge branch 'master' of gitorious.org:opensuse/yast-web-client
authorMartin Kudlvasr <mkudlvasr@novell.com>
Wed, 10 Mar 2010 18:48:32 +0000 (19:48 +0100)
committerMartin Kudlvasr <mkudlvasr@novell.com>
Wed, 10 Mar 2010 18:48:32 +0000 (19:48 +0100)
commitc475cf69eb9b527d213385be8bbd65d3c6f8b1b9
treefd64cad7ccbb95a6f93b92165e8d8d2cf2db0060
parent2c094ef0933c5ac8a60528820205737f81a510c0
parent9a3064f21fd2000ea4e44a9e17f6cf7606a56de5
Merge branch 'master' of gitorious.org:opensuse/yast-web-client

Conflicts:
plugins/software/package/webyast-software-ui.changes