Permalink
Browse files

Merge branch 'client-dev' of github.com:arax/rOCCI into client-dev

Conflicts:
	lib/occi/api/client/client_http.rb
  • Loading branch information...
2 parents 0c8e02f + d9b902c commit 8a2868e1380957a39680beae1bfe2536ed09608f @arax arax committed Feb 8, 2013
Showing with 0 additions and 0 deletions.

0 comments on commit 8a2868e

Please sign in to comment.