Merge branch 'maint'
commit197881bc1a68072ea866276c90a4fa0e33e1a34d
authorBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 08:23:28 +0000 (29 09:23 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 08:23:28 +0000 (29 09:23 +0100)
tree7736ba12d91095182efafcee0d431396b66362d2
parent95096f14b6a0e75bf7316ed22e018ea6bef0711b
parentbdbdc4cb2c7f247913e371239117299f1c6820f5
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el