Merge branch 'maint'
commit88d151b05bf022f933fc159023cb1f76e8740bd0
authorBastien Guerry <bzg@altern.org>
Wed, 19 Mar 2014 08:31:23 +0000 (19 09:31 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 19 Mar 2014 08:31:23 +0000 (19 09:31 +0100)
tree8396a0fc15fa64415e05f1e333d03509ca8e8a34
parent35f27a1fe568ddc98209cfc3e624f6e57bd870fa
parent2d09804e196339ecddd7804b1386150ab43a3838
Merge branch 'maint'
lisp/org.el