Merge branch 'maintenance-webyast-1.0'
authorMartin Vidner <mvidner@suse.cz>
Wed, 10 Mar 2010 14:21:10 +0000 (15:21 +0100)
committerMartin Vidner <mvidner@suse.cz>
Wed, 10 Mar 2010 14:21:10 +0000 (15:21 +0100)
commitdcdfe69bb25ec5c4bf2f4f3322eaa987ee570900
tree3fe52f38d4d655d770c1ed4a32269474b148401f
parent18c420a33e3e76c54480cd95263b47025b8007f0
parent5df70f686a2952ee8271923a5994c36e61340154
Merge branch 'maintenance-webyast-1.0'

Conflicts:
webservice/app/models/permission.rb
- preferred master (bnc#555208) over branch (bnc#569987)
  for more logging.
webservice/test/functional/permissions_controller_test.rb
webservice/test/unit/permission_test.rb
- preferred the branch, the tests are more refined there

Usual boring conflicts:
webservice/package/webyast-base-ws.changes
webservice/package/webyast-base-ws.spec
webservice/test/unit/permission_test.rb