Merge from emacs-24; up to 2012-12-14T15:38:50Z!monnier@iro.umontreal.ca

diff --cc doc/misc/ChangeLog
index 05f5325,1b45474..7ebaa55
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,4 -1,11 +1,11 @@@
 -2013-02-06  Glenn Morris  <rgm@gnu.org>
+ 2013-02-07  Bastien Guerry  <bzg@gnu.org>
+ 
+       * org.texi (References): Clarify an example.
+       (Installation): Fix instructions.
+       (Org-Plot): Fix link.
+       (Checkboxes, Radio lists): Fix typos.
+ 
 +2013-02-07  Glenn Morris  <rgm@gnu.org>
  
        * cl.texi (Equality Predicates): Mention memql.
  

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/gnus/ChangeLog
Simple merge

diff --cc lisp/org/ChangeLog
Simple merge

diff --cc lisp/org/org-bibtex.el
Simple merge