Merge branch 'master' of orgmode.org:org-mode
commit3fe47611c9fd05c97d02dc016cd4923217ff32aa
authorBastien Guerry <bzg@altern.org>
Wed, 10 Apr 2013 22:35:39 +0000 (11 00:35 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 10 Apr 2013 22:35:39 +0000 (11 00:35 +0200)
tree2d36bb3f0745d50a4743d224c57f424b422027a8
parent3449c6d001b8d261b104bc9dd42bf1290d74bc0b
parenta9da959ae619c2e942589f3537aed8aeabed5ac1
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el