-commit 516e1c3592bd7cb0c7c7fb19fe48ec4385835c77
-Author: Neil Puttock <n.puttock@gmail.com>
-Date: Sat Jul 23 20:44:45 2011 +0100
+commit 753d6200e9ae51f0a98186478beff2d00d63a62b
+Merge: fc5b145 2e0077b
+Author: Phil Holmes <mail@philholmes.net>
+Date: Tue Aug 30 11:23:53 2016 +0100
- Docs: Compile fix.
+ Update release/unstable with recent changes
-diff --git a/Documentation/notation/staff.itely b/Documentation/notation/staff.itely
-index 8602de4..514e182 100644
---- a/Documentation/notation/staff.itely
-+++ b/Documentation/notation/staff.itely
-@@ -1376,7 +1376,7 @@ changes and a label identifying the source instrument, can be
- tagged for selective inclusion in the score; see @ref{Using tags}.
-
- @lilypond[verbatim,quote]
--flute = \relative c'' {
-+fluteNotes = \relative c'' {
- r2. c4 d8 c d e fis2 g2 d2
- }
-
-@@ -1399,7 +1399,7 @@ bassoonNotes = \relative c {
- }
- \new StaffGroup <<
- \new Staff {
-- \flute
-+ \fluteNotes
- }
- \new Staff {
- \removeWithTag #'part { \killCues { \bassoonNotes } }