Merge branch 'upstream'

Conflicts:
	in/sitemap.md
	plugins/read_markdown.py

diff --cc in/sitemap.md
index ca8649fd9d058c730df68c725e8ab3dcde47a260,afcf51e41e83be247d811e2e7f18f9dc937900a2..ae8fd016527cb288ed27a3f140324d3c54f193fa
--- 1/in/sitemap.md
--- 2/in/sitemap.md
+++ b/in/sitemap.md
@@@ -1,5 -1,9 +1,6 @@@
  title: Sitemap
 -parent: Home
 -hide: true
 +parent: Webber
+ lang: en
  template: sitemap
 -ctime: 2009-06-24
 -mtime: 2009-06-24
  
  The following pages exist:

diff --cc in/webber.conf
index f5117ced36866ecb34910f3285c67a2e39da9474,675db98515f1d116d0f10f2e3da4ff8e99109ca5..1403d8520f06bcec584a83b63d36ec44e151855b
--- 1/in/webber.conf
--- 2/in/webber.conf
+++ b/in/webber.conf
@@@ -1,7 -1,7 +1,7 @@@
 -template: "history"
 +template: "sidebar"
  subtitle: "Webber"
  main_url: "www.holgerschurig.de/projects/webber"
- date_format: "%Y-%m.%d"
+ date_format: "%Y-%m-%d"
  input_encoding: "iso-8859-1"
  output_encoding: "iso-8859-1"
  plugins: [

diff --cc webber.py
Simple merge