Merged from mwolson@gnu.org--2006/muse--main--1.0 (patch 253-254)
commit8d87fc81f4d0763d0d132e802fc19f07124faec4
authorMichael Olson <mwolson@gnu.org>
Sun, 3 Dec 2006 00:36:18 +0000 (3 00:36 +0000)
committerMichael Olson <mwolson@gnu.org>
Sun, 3 Dec 2006 00:36:18 +0000 (3 00:36 +0000)
tree925fb036661094d376320a97191daa30d7a3e483
parentdb6d5f0ff3f1cb05c4566ea889f777874edb7165
parent3a08779bc44072d86f90df88769606bc74e16792
Merged from mwolson@gnu.org--2006/muse--main--1.0 (patch 253-254)

Patches applied:

 * mwolson@gnu.org--2006/muse--main--1.0--patch-253
   Fix minor bug in muse-replace-regexp-in-string

 * mwolson@gnu.org--2006/muse--main--1.0--patch-254
   muse-html: Make <contents> work with Planner HTML output
git-archimport-id: mwolson@gnu.org--2006-muse-el/muse-el--devel--0--patch-120