Merge branch 'maint'
commit3d45b4285bbeacca85e79b3bc5ea1e485e91e872
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 11 Sep 2014 16:27:22 +0000 (11 18:27 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 11 Sep 2014 16:27:22 +0000 (11 18:27 +0200)
tree144405c689d7b0d97954f9c66f0cec93a871424c
parentec8f245d27113d51ed5fda4cd18387acef61286c
parent01f736b763729e4d1e6a82faa31748f2bd2d1e0a
Merge branch 'maint'
lisp/org-src.el