Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org

1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index c1e3c9998d0..a74388b7d71 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-12  Eric Schulte  <eric.schulte@gmx.com>
+
+        * ob-screen.el (org-babel-screen-session-write-temp-file)
+        (org-babel-screen-test):
+        Use unpredictable names for temporary files.  (Bug#17416)
+
 2014-04-22  Aaron Ecay  <aaronecay@gmail.com>
 
         * org-src.el (org-edit-src-exit): Place an undo boundary before
@@ -286,7 +292,7 @@
 
 2014-04-22  Justin Gordon  <justin.gordon@gmail.com>
 
-        * ox-md (org-md-separate-elements): Fix blank line insertion
+        * ox-md.el (org-md-separate-elements): Fix blank line insertion
         between elements.
 
         * ox-md.el (org-md-inner-template): New function.