Skip to content

Commit

Permalink
Merge commit 'a48361d6dc9f7c27e6f4c847c009a6ed20f970d6' into talia_re…
Browse files Browse the repository at this point in the history 
…merge

Conflicts:
	lib/active_rdf/objectmanager/resource.rb
  • Loading branch information
@averell23
averell23 committed Feb 10, 2010
2 parents e1afd80 + a48361d commit 0fe9533
Show file tree
Hide file tree
Showing 3 changed files with 331 additions and 236 deletions.

0 comments on commit 0fe9533

Please sign in to comment.