Merge branch 'maint'
commitd35233f84a96c3ff7aedd142c5d84bbd383c81cf
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 18 Nov 2013 19:49:43 +0000 (18 20:49 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 18 Nov 2013 19:49:43 +0000 (18 20:49 +0100)
tree8a8be7191793b7562b3c2f63211c18b4ebf36a11
parent818c8216846b79f2e74aeca714e6eee24467f090
parentc5aad89f5a7a5d3ea5ff4db3f099c828e9f76c42
Merge branch 'maint'
lisp/org.el