Merge branch 'maint'
commitf155f5458ee0ac66614b114ac0ff2941640e4b2f
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 06:28:34 +0000 (29 08:28 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 06:28:34 +0000 (29 08:28 +0200)
treeb49773d832f15bee1508636601b0947a20d7f09f
parent74c027a741921746c26e9331f9a93f06ff6a05e1
parent7a06ed790a6f387e96b722e1142173fb839ba25b
Merge branch 'maint'
doc/org.texi
doc/orgguide.texi
lisp/ob.el
lisp/org-agenda.el