Merge branch 'master' of orgmode.org:org-mode
commit37a24b4ced3fcc4e710eb4be192ee1091af71337
authorBastien Guerry <bzg@altern.org>
Sun, 16 Mar 2014 10:07:11 +0000 (16 11:07 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 16 Mar 2014 10:07:11 +0000 (16 11:07 +0100)
tree34f5e9ca2527b815a3843281d35ecc10e5a577d9
parentb345cc759a0cd7d2906ef15997fdc5f6c5392a89
parent818e2a1de76a885bdc207de7c969c93633a2e792
Merge branch 'master' of orgmode.org:org-mode