Merge commit '32e62b000a7ebea0dde4f0be5f7f256f3bdd3a51' into talia_re…

…merge Conflicts: activerdf-rdflite/lib/activerdf_rdflite/rdflite.rb activerdf-redland/lib/activerdf_redland/redland.rb activerdf-redland/test/test_redland_adapter.rb lib/active_rdf/federation/federation_manager.rb lib/active_rdf/objectmanager/resource.rb lib/active_rdf/queryengine/ntriples_parser.rb lib/active_rdf/queryengine/query.rb
rjpbonnal · Feb 10, 2010 · 6e3d201 · 6e3d201
2 parents ac7664d + 32e62b0
commit 6e3d201
Show file tree

Hide file tree

Showing 24 changed files with 1,542 additions and 1,420 deletions.
diff --git a/activerdf-rdflite/lib/activerdf_rdflite/rdflite.rb b/activerdf-rdflite/lib/activerdf_rdflite/rdflite.rb
diff --git a/activerdf-rdflite/test/test_bnode_data.nt b/activerdf-rdflite/test/test_bnode_data.nt