]> oss.titaniummirror.com Git - webber.git/commit
Merge branch 'upstream'
authorR. Steve McKown <rsmckown@gmail.com>
Tue, 9 Aug 2011 02:14:40 +0000 (20:14 -0600)
committerR. Steve McKown <rsmckown@gmail.com>
Tue, 9 Aug 2011 02:14:40 +0000 (20:14 -0600)
commitb5bc4ffdfbaa76db7cd4cdeb078097ec17024f6b
tree90c565ebf49f865064616f792dd5ee2f8d4a6cf5
parentc6d30c7f18e835e0b99032d01b1f8acd7f077ec6
parent2c9c814b53a4ba5977eed442a2ef227fea401dfb
Merge branch 'upstream'

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