Merge branch 'maint'
commit3345817048fededa2fd2d3ba83a5c82238a150c6
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 2 Jun 2013 08:02:27 +0000 (2 10:02 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 2 Jun 2013 08:02:27 +0000 (2 10:02 +0200)
tree685522ac654890cd398237aef97d9223baa341d1
parent6e059f228f0ebc80fd7bbc12847752fa853e3385
parent53784ef861bcb71bcda9146a1b5a8d3ddaa7f975
Merge branch 'maint'
lisp/org.el