Merge branch 'master' of orgmode.org:org-mode
commit683e1db203e1420038763f9b02ad912cecf1252b
authorBastien Guerry <bzg@altern.org>
Mon, 1 Jul 2013 10:16:50 +0000 (1 12:16 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 1 Jul 2013 10:16:50 +0000 (1 12:16 +0200)
tree260ea4132e9a5ef24111fe5e790031730f1d3aed
parent163350117bcc5f42ff3492f1f2215a2b9e44a705
parentb61ef4b4328a0f34de3407add184ab0d1ad6d674
Merge branch 'master' of orgmode.org:org-mode