Merged from mwolson@gnu.org--2005 (patch 333, 337, 345-346, 349)
commitdfee1b9c7402d16d6f9f950ac176d68268d9bc81
authorMichael Olson <mwolson@gnu.org>
Fri, 6 Jan 2006 20:44:29 +0000 (6 20:44 +0000)
committerMichael Olson <mwolson@gnu.org>
Fri, 6 Jan 2006 20:44:29 +0000 (6 20:44 +0000)
tree72e57cadf0e907124855ccb0feba5244f8a932dd
parentfdf456fcc15676cc48303a4ea3ceb7f4fb96a852
Merged from mwolson@gnu.org--2005 (patch 333, 337, 345-346, 349)

Patches applied:

 * john@wjsullivan.net--2006/muse--johnsu01--0--patch-1
   Updated copyright year. Added notes about using the .muse file extension to the Projects node.

 * mwolson@gnu.org--2005/muse--main--1.0--patch-333
   muse-publish: Prevent error when return value is not a string.

 * mwolson@gnu.org--2005/muse--main--1.0--patch-337
   muse-wiki: Allow interwiki links to use different base URLs.

 * mwolson@gnu.org--2005/muse--main--1.0--patch-345
   Fix backtrace on project names.

 * mwolson@gnu.org--2005/muse--main--1.0--patch-346
   Fix #4973: muse-project-ignore-regexp too aggressive
git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-50
ChangeLog
ChangeLog.main
lisp/muse-project.el
lisp/muse-publish.el
lisp/muse-wiki.el
muse.texi