Merge branch 'master' of orgmode.org:org-mode
commit09ffff9ceee9c1974ce9e2f5aef838df4cca0270
authorBastien Guerry <bzg@altern.org>
Sat, 16 Feb 2013 10:35:59 +0000 (16 11:35 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 16 Feb 2013 10:35:59 +0000 (16 11:35 +0100)
tree57f73ea75e365772a100d7d00b026e812268b28f
parent25aabd7d2f78eb3cdccb17214ffe24a1f19a0e93
parent213e168c5380d096fa33cc3c956746a3e81dbcb2
Merge branch 'master' of orgmode.org:org-mode