Merge branch 'maint'
commit791e52bfdd1304b6ec2d1911fb1dd605d6301aa3
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Jan 2016 14:59:05 +0000 (16 15:59 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Jan 2016 14:59:05 +0000 (16 15:59 +0100)
tree279dbd97545ad13f4a13bf23f57ed43cd3acc6fa
parent4fe777fdaeb669b4b38560bc467e893656dd101a
parentce80a0e727fb4152462641209f41fea735ee459f
Merge branch 'maint'
lisp/org.el