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