Merge branch 'maint'
commit83b6cfcaec887ad9296f08f97e86e0ec69f73255
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 8 Aug 2013 12:32:34 +0000 (8 14:32 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 8 Aug 2013 12:32:34 +0000 (8 14:32 +0200)
tree022b0fb7644e3fc23ee459a6aca7832c3da803c9
parent131e7a679e310fdd1e54423892ce9db24594ffba
parentab8bfb846077e41c2e378f40faf6ad66eb33a526
Merge branch 'maint'
lisp/org-clock.el