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