Yann Esposito (Yogsototh) 67e4695de7 Merge branch 'next' ... Conflicts: output/Scratch/en/index.html output/Scratch/fr/index.html output/Scratch/sitemap.xml		2012-04-06 14:10:46 +02:00
..
index.html	Merge branch 'next'	2012-04-06 14:10:46 +02:00