Merge branch 'maint'
commitd79227cbd15358939742dc6e2f16668f10811441
authorBastien Guerry <bzg@altern.org>
Sun, 30 Sep 2012 18:20:36 +0000 (30 20:20 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 30 Sep 2012 18:20:36 +0000 (30 20:20 +0200)
treea5153ce4724199d62c2f1e4d1e85d163f45c852c
parente189be5720bac6f7f20426d35ca0a9c09fb79eed
parentf95e5ff1ba16ea407a635fd2281061fb9d80e696
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el