Merge branch 'maint'
commitb66ff157e1930453cc7843328aadd671b228ec72
authorBastien Guerry <bzg@altern.org>
Fri, 16 Mar 2012 18:19:24 +0000 (16 19:19 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 16 Mar 2012 18:19:24 +0000 (16 19:19 +0100)
tree01bbb5a9ed1b18b4efd6fd09879220652105251f
parentd23ce33583e3048a922b5e26af452a69cbfbcdd1
parent8e7f84ea3d021c3513a9fce9b275c2f93fa95f2d
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el