Merge branch 'maint'
commitdddd9fb4af58e1cc6760ee4a2d3b3408f2f25c0e
authorBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 13:49:02 +0000 (23 14:49 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 13:49:02 +0000 (23 14:49 +0100)
treeddf9b7c0ff10cfe1d31a8a9d764eacbacc948bbe
parent1e2b26b62a61c43717188b5089ddfbe8369885c6
parent345cfbec2503040c89ebedd75d6e660fcb6be14e
Merge branch 'maint'
lisp/org-clock.el