Merge branch 'eula' of git@git.opensuse.org:projects/yast/rest-service
authorMartin Kudlvasr <mkudlvasr@suse.cz>
Thu, 15 Oct 2009 16:13:03 +0000 (18:13 +0200)
committerMartin Kudlvasr <mkudlvasr@suse.cz>
Thu, 15 Oct 2009 16:13:03 +0000 (18:13 +0200)
commit4880cef95999f28a6cb92cb78a71e71070246daa
treef828065851d9ad368f2ffb5b7dcc4f2dc8d1729e
parent61ce112729b97c448d0483f97090a7f124f87972
parent6a6a7873578463196f45cf475de7b9bece61c318
Merge branch 'eula' of git@git.opensuse.org:projects/yast/rest-service

Conflicts:
plugins/eulas/app/controllers/eulas_controller.rb
plugins/eulas/app/models/license.rb
plugins/eulas/app/controllers/eulas_controller.rb
plugins/eulas/app/models/license.rb