Merge branch 'maint'
commit99af267738ad3fdc8a32e2c25f14c3c2776c0c7c
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 21 Apr 2014 07:25:22 +0000 (21 09:25 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 21 Apr 2014 07:25:22 +0000 (21 09:25 +0200)
treef046f1bd650550403e70fdb7dc907f05efbd49f7
parent881459c6bc092b8450939333209c6b89a3000f07
parentf9c93aaa4931b618b87ff981e2bea48a2157a14a
Merge branch 'maint'
lisp/org.el