Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Fri, 14 Mar 2014 11:07:06 +0000 (12:07 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 14 Mar 2014 11:07:06 +0000 (12:07 +0100)
commite75d2031bc889a346be8109db4690034b007d3ab
tree0da20ae3620a9a607fe4ae84e90a7fe19f5e55bd
parent07347025ee204b76d372a5cd62a37d5a5feb0472
parent62d759e3c941898ccf36569321b21a987281ffeb
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el