Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06
commit3df72679bb7bf07bfebb96f7caba2cf6e160dc13
authorBastien Guerry <bzg@altern.org>
Sun, 25 Mar 2012 00:51:11 +0000 (25 01:51 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 25 Mar 2012 00:51:11 +0000 (25 01:51 +0100)
treed4ee9c909555adc8f617a6e47fff6f30e1069395
parente8337f69202bab64702bfe067711f64607794b4c
parent6ad53828cc1400ece04043c624d478047f2d0b87
Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06