Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service into basesystem
authorJosef Reidinger <jreidinger@suse.cz>
Thu, 10 Sep 2009 07:00:50 +0000 (09:00 +0200)
committerJosef Reidinger <jreidinger@suse.cz>
Thu, 10 Sep 2009 07:00:50 +0000 (09:00 +0200)
commit99b90d8d2bdb2363d64869686153b4caf34a842c
tree993e639f751eaec5d5e44a37e1b2ff69f68f14ed
parent5e82c39a1e5eae55ec567b397ccc56509557c9b9
parent8f817d671168fc78f75ce54f4d577e4099cd8b54
Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service into basesystem

Conflicts:
plugins/patches/app/models/packagekit.rb
plugins/services/package/yast2-webservice-services.spec
plugins/patches/package/yast2-webservice-patches.spec