From: Glenn Morris <rgm@gnu.org>
Date: Sun, 3 Mar 2013 02:39:57 +0000 (-0800)
Subject: Merge from emacs-24; up to 2012-12-24T06:24:08Z!eggert@cs.ucla.edu
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/0273a428450950cf846767982cdb77cc9937a1f3

Merge from emacs-24; up to 2012-12-24T06:24:08Z!eggert@cs.ucla.edu
---

0273a428450950cf846767982cdb77cc9937a1f3
diff --cc doc/lispref/ChangeLog
index 42f5b5f553,8947685c52..16866d5c8c
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
+ 2013-03-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* objects.texi (Symbol Type): Fix typo.
+ 
 -2013-02-27  Bastien Guerry  <bzg@gnu.org>
 +2013-02-28  Bastien Guerry  <bzg@gnu.org>
  
  	* variables.texi (File Local Variables): Fix reference.