Merge branch 'maint'
commita5483f2d3972f57ecbe8459fd332f7018e773363
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 21:46:15 +0000 (29 23:46 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 21:46:15 +0000 (29 23:46 +0200)
treeb539c145fcf8d58c5d5d224dbae1e22a879d6898
parent871a041ab9e398a2063d4304433da4b81176a22c
parentc7ffcf924663fccd775e6c9082b372a51f05a86f
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el