Merge branch 'maint'
commitc815fe55cd06e3506623fce8b016afb1375c7dbd
authorBastien Guerry <bzg@altern.org>
Tue, 23 Jul 2013 23:37:33 +0000 (24 01:37 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 23 Jul 2013 23:37:33 +0000 (24 01:37 +0200)
treef28cdd613948e82bce42f02454974c7c318a5b39
parent2b5670d453f36f3596a2d6ed46ed9c2a0cf88072
parentc31ad79326afb0ee252e286b979a647dd5a289e8
Merge branch 'maint'
lisp/ox.el