Merged from mwolson@gnu.org--2006/muse--main--1.0 (patch 388-389)
commitbc795c69515a89b9433d15ad7fe1994c53c49aec
authorMichael Olson <mwolson@gnu.org>
Sun, 15 Jul 2007 14:57:20 +0000 (15 14:57 +0000)
committerMichael Olson <mwolson@gnu.org>
Sun, 15 Jul 2007 14:57:20 +0000 (15 14:57 +0000)
treebd2f3241957580724052e923234a52183d3ad3b8
parent1d21ec5e59245c108211026f9b704c93d8bdd580
parent5638da92a2f129ad5473cbc30d7b47aec653f888
Merged from mwolson@gnu.org--2006/muse--main--1.0 (patch 388-389)

Patches applied:

 * mwolson@gnu.org--2006/muse--main--1.0--patch-388
   muse-publish: Use only <lisp> and <markup> in headers and footers

 * mwolson@gnu.org--2006/muse--main--1.0--patch-389
   muse-journal: Allow <lisp> and <markup> to work in entry templates
git-archimport-id: mwolson@gnu.org--2006-muse-el/muse-el--devel--0--patch-154