Merge branch 'maint'
commit9f1f0535bec62c8a0566f48c551ad97dced7b05b
authorBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:20:51 +0000 (23 17:20 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:20:51 +0000 (23 17:20 +0100)
treef8a8912f4c3b60f25f7d1ec38ae1d36ea16ce98f
parent3684f84aeeb0d93d9c97a388d947b0e772375c20
parent54731c965d9ea68f6d7c1ec5b558de9b56d30840
Merge branch 'maint'
lisp/org-clock.el
lisp/org-table.el
lisp/org.el