Merge branch 'maint'
commitced4fa3205ec99fbc63d7e3420b49d9ffd885056
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Jul 2014 09:05:49 +0000 (25 11:05 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Jul 2014 09:05:49 +0000 (25 11:05 +0200)
tree969fb185ba872cac7855e8cecd829f2f7f5622d8
parent010d105b044e522f704bd4c42a7b69b7e07c7d7a
parentbacfe5b4f7244eaf151f4e26a1d94dd8f66c1d19
Merge branch 'maint'
lisp/org-clock.el