Yann Esposito 242b850c18 Merge branch 'master' into next ... * master: regeneration regeneration the size is a bug on linux only regeneration regeneration fixed a js bug due to new entry transition page faster to show content less inconvenient Conflicts: output/Scratch/assets/css/main.css output/Scratch/en/blog/feed/feed.xml output/Scratch/fr/blog/feed/feed.xml output/Scratch/sitemap.xml output/index.html		2012-10-11 09:47:34 +02:00
..
The_destination_tree.png	Merge branch 'master' into next	2012-10-11 09:47:34 +02:00
The_source_tree.png	Merge branch 'master' into next	2012-10-11 09:47:34 +02:00