# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1329225876 -3600
# Node ID d38805d89dd50e0521dc5f664d79030fc5fda1ae
# Parent  9bbd4e653f16f0a6177c84869768e51e4c037a73# Parent  8d2fcfbc2fd96d4131fabe8d8737667f046f962a
Merge with 044eac921ad2181845580252f1007a869c42dd5f

diff -r 8d2fcfbc2fd9 -r d38805d89dd5 web/common.php
--- a/web/common.php	Tue Feb 14 14:22:15 2012 +0100
+++ b/web/common.php	Tue Feb 14 14:24:36 2012 +0100
@@ -22,7 +22,7 @@
 array("fens_FabLab_Design_Metadata","designmd"), array("mashup","conference"), array("mashup","tableronde"),
 	"sig-chi-paris-2011", "rwd-meetup-patrimoine", "2011-2012-museo-ouverture"/*, "JaneMcGonigal-gameDesign"*/,
 	"iii-catastrophe", "edito-inaugurale", "2011-2012-museo-structured-data",
-	"edito-intelligence",
+	"edito-webdoc","edito-intelligence",
 );
 
 
diff -r 8d2fcfbc2fd9 -r d38805d89dd5 web/edito-intelligence/config.php
--- a/web/edito-intelligence/config.php	Tue Feb 14 14:22:15 2012 +0100
+++ b/web/edito-intelligence/config.php	Tue Feb 14 14:24:36 2012 +0100
@@ -49,7 +49,7 @@
  	'archive_description' => 'par <a href="http://www.sens-public.org" target="_blank">Sens Public</a> et l\'<a href="http://www.iri.centrepompidou.fr" target="_blank">IRI</a><br/>au Centre Pompidou le jeudi 19 janvier 2012 17:30 - 19:30',
 
     // After the event
-	'metadata'    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/8287b1ea-4766-11e1-91fc-00145ea49a02",
+	'metadata'    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/5510ecc4-5565-11e1-ac23-00145ea49a02",
 	'duration'   => 6640378,
 	'player'        => "res/metadataplayer/src/js/LdtPlayer.js",
 	'div_height'    => 700,
diff -r 8d2fcfbc2fd9 -r d38805d89dd5 web/edito-webdoc/config.php
--- a/web/edito-webdoc/config.php	Tue Feb 14 14:22:15 2012 +0100
+++ b/web/edito-webdoc/config.php	Tue Feb 14 14:24:36 2012 +0100
@@ -27,7 +27,7 @@
  	'archive_description' => 'par <a href="http://www.sens-public.org" target="_blank">Sens Public</a> et l\'<a href="http://www.iri.centrepompidou.fr" target="_blank">IRI</a><br/>au Centre Pompidou le jeudi 1 décembre 2011 17:30 - 19:30',
 
     // After the event
-	'metadata'    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/0911926e-093a-11e1-996f-00145ea49a02",
+	'metadata'    => "http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/8eea9a1c-270c-11e1-9c62-00145ea49a02",
 	'duration'   => 8357400,
 	'player'        => "res/metadataplayer/src/js/LdtPlayer.js",
 	'div_height'    => 700,