Merge branch 'master' of git://git.sv.gnu.org/lilypond

author Graham Percival <graham@percival-music.ca>

Mon, 15 Oct 2007 02:03:32 +0000 (19:03 -0700)

committer Graham Percival <graham@percival-music.ca>

Mon, 15 Oct 2007 02:03:32 +0000 (19:03 -0700)
author Graham Percival <graham@percival-music.ca>
Mon, 15 Oct 2007 02:03:32 +0000 (19:03 -0700)
committer Graham Percival <graham@percival-music.ca>
Mon, 15 Oct 2007 02:03:32 +0000 (19:03 -0700)
diff --cc THANKS
Simple merge
diff --cc scm/define-grob-properties.scm
Simple merge
diff --cc scm/define-markup-commands.scm
Simple merge
author	Graham Percival <graham@percival-music.ca>
	Mon, 15 Oct 2007 02:03:32 +0000 (19:03 -0700)
committer	Graham Percival <graham@percival-music.ca>
	Mon, 15 Oct 2007 02:03:32 +0000 (19:03 -0700)
		1	2
THANKS	patch \|	diff1 \|	diff2 \|	blob \| history
scm/define-grob-properties.scm	patch \|	diff1 \|	diff2 \|	blob \| history
scm/define-markup-commands.scm	patch \|	diff1 \|	diff2 \|	blob \| history