Merge branch 'maint'master
authorBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 15:11:35 +0000 (17:11 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 15:11:35 +0000 (17:11 +0200)
commitb8ba8cbe3662777122baa3ac9f709eeb29857db5
treee856a66186c594f828f64f59b6ffadb8c663ec36
parent53aab23e70e16e872c8a7194b2601f3205aa417d
parenteaaa5c2e48c054a3d6dbfea4ed0bee16c0b78369
Merge branch 'maint'

Conflicts:
lisp/ox-latex.el
lisp/ox-latex.el