Merge from mainline.

1 files changed, 27 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index cbcd698e8b1..29118deba7f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,30 @@
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * unidata/Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-27  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-misc-manuals): Use INFO_COMMON rather than
+        INFO_TARGETS.  "faq" does not need special treatment any more.
+
+2013-08-15  Glenn Morris  <rgm@gnu.org>
+
+        * make-tarball.txt: Mention generating pdfs in etc/refcards.
+
+2013-08-15  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/hydra: More information about Hydra.
+
+2013-08-10  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/hydra: New file.
+
+2013-08-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix some minor races in hosts lacking mkostemp (Bug#15015).
+        * merge-gnulib (GNULIB_MODULES): Add mkostemp.
+
 2013-07-12  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (manual-style-string): Use non-abbreviated url.