Merge branch 'maint'
commitc10ba5f3dcc02bec1e3b6f0930768ba251369c55
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 24 Jan 2016 17:09:22 +0000 (24 18:09 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 24 Jan 2016 17:09:22 +0000 (24 18:09 +0100)
tree4de8584b1210915125dcbc302fefde18f60a084c
parenta88e51dc3f50739349c95776cae7e9230623e88a
parent921da3290a1b660b1b3829eb880abd740ab17e0a
Merge branch 'maint'
lisp/org.el