Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service
authorMichael Andres <ma@suse.de>
Thu, 3 Jul 2008 18:53:19 +0000 (20:53 +0200)
committerMichael Andres <ma@suse.de>
Thu, 3 Jul 2008 18:53:19 +0000 (20:53 +0200)
commit3db2ba85df3c8cc8cfcd7309ae6081ef19dbfa73
tree7a081cb5d008d86db6e9d90a4762fa124919c05c
parentd973c4624162de09d3b56c716d4600f79927486b
parentd9eda1a2d084cda042edb5470b33dbdde4db93dc
Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service

Conflicts:

yast-api/app/controllers/services/ntp_controller.rb
yast-api/config/routes.rb
yast-api/config/routes.rb