Merge branch 'master' of gitorious.org:opensuse/yast-rest-service into role_mgmt role_mgmt
authorJosef Reidinger <jreidinger@suse.cz>
Fri, 21 May 2010 16:32:42 +0000 (18:32 +0200)
committerJosef Reidinger <jreidinger@suse.cz>
Fri, 21 May 2010 16:32:42 +0000 (18:32 +0200)
commit5f3c31ce1fbff665d685070738b9b9ad12ed5428
tree2cb17a934547fdfc7b417ef73c67016e4c60e593
parent375ba4706d871dbfc720c8883e248daaf6efbbde
parentc970c09541c2cf1d1289fc2928bbfe4440946899
Merge branch 'master' of gitorious.org:opensuse/yast-rest-service into role_mgmt

Conflicts:
plugins/roles/test/unit/role_test.rb
webservice/lib/exceptions.rb