# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1231958388 -3600
# Node ID 5e93f8a8b1f099c58b9f1b94f07c332643e7d1e7
# Parent  828424d2eb3c71f92c77328c68b1cf502e17e40b# Parent  b33a36f30a3885d11b7b319b7d87a503f4928b26
merge

diff -r b33a36f30a38 -r 5e93f8a8b1f0 server/sources/pyrorql.py
--- a/server/sources/pyrorql.py	Wed Jan 14 19:18:29 2009 +0100
+++ b/server/sources/pyrorql.py	Wed Jan 14 19:39:48 2009 +0100
@@ -117,6 +117,7 @@
         self.support_entities = mapping['support_entities']
         self.support_relations = mapping.get('support_relations', {})
         self.dont_cross_relations = mapping.get('dont_cross_relations', ())
+        self.cross_relations = mapping.get('cross_relations', ())
         baseurl = source_config.get('base-url')
         if baseurl and not baseurl.endswith('/'):
             source_config['base-url'] += '/'