LSPW reported that an entry in the references file was missing (Chypre). We checked back through SVN, and confirmed that it had never been present during the time we've been using SVN, but I found an old version of the references file from Mariage version 4, and we retrieved it from there.

Meanwhile, there were conflicts with the le_bon_mariage.xml file, arising I think when EGB forgot to do an svn update before starting work, after I had edited the file on the 14th. I think I've resolved these, but we'll know for sure tomorrow when she comes in and does an update.