Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service into resourc...
authorMartin Kudlvasr <mkudlvasr@suse.cz>
Tue, 22 Sep 2009 12:01:18 +0000 (14:01 +0200)
committerMartin Kudlvasr <mkudlvasr@suse.cz>
Tue, 22 Sep 2009 12:01:18 +0000 (14:01 +0200)
commit31a1e73557a06ce47ecf01f8793a77804374335b
treed8c9257ea8aec92119dcce211c97232012b40d8a
parentedb3720d0c453abfdd5fb88281957e58e5128a63
parentb698621ce5ff6074229fc66e71d4e79f78bbdc20
Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service into resource-restful

Conflicts:
webservice/config/routes.rb
webservice/config/routes.rb