Merge branch 'maint'
commit881459c6bc092b8450939333209c6b89a3000f07
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 21 Apr 2014 07:22:54 +0000 (21 09:22 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 21 Apr 2014 07:22:54 +0000 (21 09:22 +0200)
treea497a5b694f1b9c90536ac10a294223f72f25f96
parentb5554077cb109ba676486535c93bb3bc54fe1424
parent2434d3e2486938364e02726e7efcbf86a1ef0dc3
Merge branch 'maint'
lisp/org.el