Merge branch 'maint'
commit394398afab047382f529baa94ed264dc3882d54d
authorBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 13:17:13 +0000 (31 14:17 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 13:17:13 +0000 (31 14:17 +0100)
tree4e659161373298158296a75490b563313f5de7b6
parentad9ca25d869f264f87e76932fc717f5e680de9c2
parent9cb3d3e7f8554b54fc4086c168327091be296da9
Merge branch 'maint'
lisp/org-clock.el