Merge branch 'master' of orgmode.org:org-mode
commit5b9cbe92913e693749ecfb2f60891042ecf8009c
authorBastien Guerry <bzg@altern.org>
Tue, 31 Jul 2012 14:14:33 +0000 (31 16:14 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 31 Jul 2012 14:14:33 +0000 (31 16:14 +0200)
tree5b12ded45a631ffb95ced4ba4e82e0bcb73edc67
parenteb5631359a7b1447f3a330932850229e51b369e6
parentfcca4ab8e459b1d589ded4ddcb206ad6637600cd
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el