Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service
authorCornelius Schumacher <cschum@suse.de>
Fri, 4 Jul 2008 10:00:37 +0000 (12:00 +0200)
committerCornelius Schumacher <cschum@suse.de>
Fri, 4 Jul 2008 10:00:37 +0000 (12:00 +0200)
commitb96a776e05c63be8a7081c53bd325d1ebf12d6b6
tree61e7124c66ff0a7b1f7f2736fe95cf552795a697
parent5c35460bb160d7b85008fb6d2a6e5739acecfb45
parenta61d9e76210b4298c56448256641f9176956c7cb
Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service

Conflicts:

yast-api/app/controllers/system/systemtime_controller.rb
yast-api/app/controllers/system/systemtime_controller.rb