Merged from mwolson@gnu.org--2006/muse--main--1.0 (patch 334-335)
commita6a04f5c23d71096ac1d3ebc4a76833acc7bd265
authorMichael Olson <mwolson@gnu.org>
Tue, 5 Jun 2007 03:00:26 +0000 (5 03:00 +0000)
committerMichael Olson <mwolson@gnu.org>
Tue, 5 Jun 2007 03:00:26 +0000 (5 03:00 +0000)
tree3aa31c7ef160dceccab484ded054cb0b66c97060
parent6a1fb8be977a79f63063e0399778b61d5d61bb2e
parentf9b31c778941bf3e1dc4fa472590d4695a250250
Merged from mwolson@gnu.org--2006/muse--main--1.0 (patch 334-335)

Patches applied:

 * mwolson@gnu.org--2006/muse--main--1.0--patch-334
   Fix bug with <contents> and multiple <include> tags

 * mwolson@gnu.org--2006/muse--main--1.0--patch-335
   Fix bug #5115: Avoid accessing remote files during fontification
git-archimport-id: mwolson@gnu.org--2006-muse-el/muse-el--devel--0--patch-142