Merge branch 'maint' master
authorBastien Guerry <bzg@altern.org>
Tue, 29 Jul 2014 21:28:34 +0000 (23:28 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 29 Jul 2014 21:28:34 +0000 (23:28 +0200)
1  2 
lisp/org.el
lisp/ox-publish.el

diff --cc lisp/org.el
Simple merge
Simple merge