Merge branch 'master-fixes'
commite815ab5f8e7d026a6bbca11e6aee51aa159ada20
authorBastien Guerry <bzg@altern.org>
Sat, 22 Dec 2012 23:34:49 +0000 (23 00:34 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 22 Dec 2012 23:34:49 +0000 (23 00:34 +0100)
treed6ef1d8b367beb0012a22d74951e12db8dbee9c7
parentb6eede54b240316d6de55e7612919b65a0a6b624
parenta0fd83976a2d8550bc34286741d92b87e7302961
Merge branch 'master-fixes'
doc/org.texi
lisp/org.el