Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 12 Jul 2013 07:10:26 +0000 (09:10 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 12 Jul 2013 07:10:26 +0000 (09:10 +0200)
commit0cdf2eb7ce71c465e7391288fb7da6970b7bf80f
tree224484096a4fd0298baff45997a0841101fd992a
parent9f3bed367b50a9bc218febeb21448c64892d3175
parenta2a5c8fd5bc39d333c23d7262732cd1529cc005a
Merge branch 'maint'

Conflicts:
contrib/lisp/ox-koma-letter.el
contrib/lisp/ox-koma-letter.el
lisp/ox-beamer.el
lisp/ox-latex.el