Merge branch 'maint'
commit1bf67e2903a62df05ad23d95d02f8d83517eb427
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 3 Nov 2013 12:08:44 +0000 (3 13:08 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 3 Nov 2013 12:08:44 +0000 (3 13:08 +0100)
tree43c0c28dec818cfa794cff249bd522de2f92997d
parentd3756ccd84c22026f0e1f227b78e5d3adf092f48
parente186cc804b9302e3c85a149cf2a08ed124634b6b
Merge branch 'maint'
lisp/org.el