Merge branch 'maint'
commit8866f86624b0737e3f9052be7582b51330e2365b
authorBastien Guerry <bzg@altern.org>
Fri, 26 Oct 2012 13:12:02 +0000 (26 15:12 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 26 Oct 2012 13:12:02 +0000 (26 15:12 +0200)
tree0edb7bcbf7239c8a3ba5e0cac2ece204346482d6
parentb5aded108df66f1ddb13a2caace65c3a823fcb77
parent7a9d3457073ce60670d0d0a02cbfcb9c34e9794b
Merge branch 'maint'
lisp/org-agenda.el
lisp/org-clock.el
lisp/org.el