Merge branch 'maint'
commitf43c8c8100470d9e92aafb58e53a8959c920c7af
authorBastien Guerry <bzg@altern.org>
Sun, 2 Sep 2012 11:45:18 +0000 (2 13:45 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 2 Sep 2012 11:45:18 +0000 (2 13:45 +0200)
tree8b8c2a614bfb8204a22ff83faa03902b7c918dec
parent845daf66484bb6a9e9f3b7bcc9bf175daddee3c3
parentc7b3c56efd63eaa54428c73c15dea4ec134cb11f
Merge branch 'maint'
doc/org.texi
lisp/org-agenda.el
lisp/org.el