Merge branch 'master' of orgmode.org:org-mode
commit511fb10eb1a70ea56f841298ce8a9aecb5538485
authorBastien Guerry <bzg@altern.org>
Tue, 1 Mar 2011 12:07:28 +0000 (1 13:07 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 1 Mar 2011 12:07:28 +0000 (1 13:07 +0100)
tree959bd8cfad0436cd459b56a23594f9deb995fcde
parent02ee22345d4c8fdb3baf41c691c1e3b56746bb30
parentb65280ae2be0c87a0f8d421e3b2deb2035b2fcf0
Merge branch 'master' of orgmode.org:org-mode