Merge branch 'maint'
commit7feec64988feadc1804eeb890c00e7ec30ea21bd
authorBastien Guerry <bzg@altern.org>
Mon, 7 Jan 2013 21:29:11 +0000 (7 22:29 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 7 Jan 2013 21:29:11 +0000 (7 22:29 +0100)
tree5c91e82f56f47319cbe17a5463ffadf5a6ae260d
parent68c1ad99ead158e2fbe8ef8f5c7dcad4325425e8
parent55a47896618e85ed9c4eb553e6bd07f74c40c36e
Merge branch 'maint'
lisp/org-agenda.el