Merge branch 'maint'
commit483977e016334088acdbe743b266f9e102e50d9e
authorBastien Guerry <bzg@altern.org>
Tue, 30 Jul 2013 10:44:56 +0000 (30 12:44 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 30 Jul 2013 10:44:56 +0000 (30 12:44 +0200)
tree1e5ff6ee6e8ddedf00db333eeb81f5dd531d3470
parent184109d416fb3a23811dd0ec3d0aeb96f699da6c
parent2710267ed74a99829aeb3fae0a669573d14c7e43
Merge branch 'maint'
lisp/org-clock.el