# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1479772987 0
# Node ID 36d3adf30558b3fd3c9f90ec1c78f9f01bf2dc3c
# Parent  604955638cd6274aaba0957e18f17ae8e8dd39fd# Parent  261c898e09da10a712309cdd0e6d5347713ab133
Merge upstream.

diff -r 261c898e09da -r 36d3adf30558 Session/MazurkaAuvergne.abc
--- a/Session/MazurkaAuvergne.abc	Mon Nov 21 22:58:57 2016 +0000
+++ b/Session/MazurkaAuvergne.abc	Tue Nov 22 00:03:07 2016 +0000
@@ -1,7 +1,7 @@
 X:1
 T: Mazurka d'Auvergne
 H:Dottes: In previous editions of the Booke, this was incorrectly
-H: titled _Mazurka Avignon_.
+H:+ titled _Mazurka Avignon_.
 M:3/4
 L:1/8
 Q:120
diff -r 261c898e09da -r 36d3adf30558 Session/htaccess
--- a/Session/htaccess	Mon Nov 21 22:58:57 2016 +0000
+++ b/Session/htaccess	Tue Nov 22 00:03:07 2016 +0000
@@ -1,1 +1,1 @@
-Redirect 301 MazurkaAvignon.html MazurkaAuvergne.html
+RedirectMatch permanent "(.*)/MazurkaAvignon\.html$" "$1/MazurkaAuvergne.html"