Merge branch 'maint'
commitbf47838d772e2be979c2f2941261627c4984199a
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 19 May 2014 11:39:06 +0000 (19 13:39 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 19 May 2014 11:39:06 +0000 (19 13:39 +0200)
tree0a5c3209d00d64beb91f259df32d5212d77605cb
parentf58201b1e1b0788098b1bbca45e06e015f5b0b7b
parent5b43ea1cd70f5a1df5cc309ffaaa3abcc420e6bf
Merge branch 'maint'
lisp/ox-beamer.el