From: R. Steve McKown <rsmckown@gmail.com>
Date: Tue, 9 Aug 2011 02:14:40 +0000 (-0600)
Subject: Merge branch 'upstream'
X-Git-Url: https://oss.titaniummirror.com/gitweb?p=webber.git;a=commitdiff_plain;h=b5bc4ffdfbaa76db7cd4cdeb078097ec17024f6b

Merge branch 'upstream'

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

b5bc4ffdfbaa76db7cd4cdeb078097ec17024f6b
diff --cc in/sitemap.md
index ca8649f,afcf51e..ae8fd01
--- a/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 f5117ce,675db98..1403d85
--- a/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: [