Merged from mwolson@gnu.org--2006 (patch 151-152)
commit2929cd3fd5e2f7ae40f0fff8a0dad77e938333ff
authorMichael Olson <mwolson@gnu.org>
Sat, 3 Jun 2006 22:49:21 +0000 (3 22:49 +0000)
committerMichael Olson <mwolson@gnu.org>
Sat, 3 Jun 2006 22:49:21 +0000 (3 22:49 +0000)
tree38e492e140c9e7e7e76eda61204a7ea0ffc732de
parentb228d4ed5229d97aeaa91f8856a5bb4d940f89aa
parentb964832e2ebf8272e19612db3acefaac1f619cf4
Merged from mwolson@gnu.org--2006 (patch 151-152)

Patches applied:

 * mwolson@gnu.org--2006/muse--main--1.0--patch-151
   Provide some markup shortcuts for the <include> tag.

 * mwolson@gnu.org--2006/muse--main--1.0--patch-152
   Move Debian stuff into its own branch.
git-archimport-id: mwolson@gnu.org--2006-muse-el/muse-el--devel--0--patch-78