Merge branch 'maint'
commit0276cf0975ec5bf3eed802c554dfb81d60148b65
authorBastien Guerry <bzg@altern.org>
Fri, 28 Dec 2012 17:37:53 +0000 (28 18:37 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 28 Dec 2012 17:37:53 +0000 (28 18:37 +0100)
tree3af07043c16dcad00bc328609c3c1ff695b3dc48
parent2792bc11a087a7456fd0f19ace0a98391f02fbbf
parent43a242c44d6af058559b6d13fce3bb6c460edd1c
Merge branch 'maint'
lisp/org-clock.el
lisp/org-exp.el
lisp/org.el