Merge branch 'master' into cairo

2 files changed, 6 insertions, 4 deletions

diff --git a/admin/notes/hydra b/admin/notes/hydra
index 7f8615de975..80ce787b6b0 100644
--- a/admin/notes/hydra
+++ b/admin/notes/hydra
@@ -1,4 +1,4 @@
--*- outline -*-
+-*- mode: outline; coding: utf-8 -*-
 
 Copyright (C) 2013-2015 Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 13971ef18c0..028bcc187af 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -167,8 +167,8 @@ nontrivial changes to the build process.
         leim/CXTERM-DIC/QJ.tit
         leim/CXTERM-DIC/SW.tit
         leim/CXTERM-DIC/TONEPY.tit
-        leim/MISC-DIC/pinyin.map
         leim/MISC-DIC/CTLau.html
+        leim/MISC-DIC/pinyin.map
         leim/MISC-DIC/ziranma.cin
 
  * cp850
@@ -237,9 +237,11 @@ nontrivial changes to the build process.
 
      These files contain characters that cannot be encoded in UTF-8.
 
-        lisp/language/tibetan.el
-        lisp/language/tibet-util.el
+        lisp/language/ethio-util.el
+        lisp/language/ethiopic.el
         lisp/language/ind-util.el
+        lisp/language/tibet-util.el
+        lisp/language/tibetan.el
         lisp/leim/quail/ethiopic.el
         lisp/leim/quail/tibetan.el