Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 15:01:01 +0000 (16:01 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 22 Jan 2013 15:01:01 +0000 (16:01 +0100)
1  2 
doc/org.texi
lisp/org-agenda.el

diff --cc doc/org.texi
Simple merge
Simple merge