Merge branch 'maint'
commitb6eede54b240316d6de55e7612919b65a0a6b624
authorBastien Guerry <bzg@altern.org>
Sat, 22 Dec 2012 23:34:42 +0000 (23 00:34 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 22 Dec 2012 23:34:42 +0000 (23 00:34 +0100)
tree4ed83486ffc7604643be5fdbb0ac875fd03a8ee9
parent830e231ef1da5c5a1ab760a6a059551841952610
parent6b9d77eb8c299b214a0a50512e78a78b64e26ad0
Merge branch 'maint'
doc/org.texi
doc/orgguide.texi
lisp/org.el