Merge branch 'master' of orgmode.org:org-mode
commit52ba37b8c849386646cdb6d2dbdaef97edbdaad6
authorBastien Guerry <bzg@altern.org>
Sat, 6 Apr 2013 17:11:57 +0000 (6 19:11 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 6 Apr 2013 17:11:57 +0000 (6 19:11 +0200)
treeaa49e843f59abfe7e06c545b03b084f2ee8edae2
parent1e496cc8f9edf4c385128511b3598878d8603b0b
parentf2fd1851753c8727407d794e63ebe91a01426c05
Merge branch 'master' of orgmode.org:org-mode
lisp/ox.el