Merge branch 'maint'
commit719b6ec77de7c8e71d9ebc86db1d02285770232d
authorBastien Guerry <bzg@altern.org>
Wed, 19 Mar 2014 09:49:01 +0000 (19 10:49 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 19 Mar 2014 09:49:01 +0000 (19 10:49 +0100)
tree84730233843feb2caa29bd8123ca06cf52e1d97d
parent599ccd1cc83cc8a1b0af82ac93e23760637b37b5
parent3a233aa6d94f27d4c4c11fb7a679a47b97001a2c
Merge branch 'maint'
lisp/org-clock.el