Merge branch 'maint'
commiteb79f0e35d2deec16844bc39622a1b42938b2f8f
authorBastien Guerry <bzg@altern.org>
Mon, 6 Jan 2014 10:02:31 +0000 (6 11:02 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 6 Jan 2014 10:02:31 +0000 (6 11:02 +0100)
tree1509cfad93447f6b0ec5034d610c45413b7e79df
parent721cc10b5a8aad38f9641897781cf328e7a5d85e
parent2755f8d95454baddee873d5c7cf53923be6ad663
Merge branch 'maint'
lisp/org-clock.el