Merge branch 'maint'
commit368aa1078f7db1ee60ad058ad835d367556e8341
authorBastien Guerry <bzg@altern.org>
Fri, 21 Mar 2014 23:28:30 +0000 (22 00:28 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 21 Mar 2014 23:28:30 +0000 (22 00:28 +0100)
tree0d33c5efcc1ef6fde821cb2b38b5ee181d2b3019
parentd6d1f25429dce2abdd26fba004c6c496d00eeb9d
parentb399ff0cba2382bf52d5bb6ef2b4a776fe0ac902
Merge branch 'maint'
lisp/org.el
lisp/ox-latex.el