Merge branch 'maint'
commitdca85fec629e9148cd4c7ea368321edd5637da58
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 28 Oct 2013 08:53:42 +0000 (28 09:53 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 28 Oct 2013 08:53:42 +0000 (28 09:53 +0100)
treef14ec939c8474c1ff34a110835d632e415db2c8a
parentac1c88294efbee5b8cb1408ce33defb4f6603875
parentda232c9711f4edfc5425b0fc4bdfe91d9b6ef395
Merge branch 'maint'
lisp/org.el