Merge branch 'master' of orgmode.org:org-mode
commiteae2dffd67ab19732dababfd5a6f28e939ab1011
authorBastien Guerry <bzg@altern.org>
Wed, 2 Mar 2011 17:15:35 +0000 (2 18:15 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 2 Mar 2011 17:15:35 +0000 (2 18:15 +0100)
tree0a08e157021e8590a3954eee92a47125e0786e34
parente7409b5cd105c33b3053e4ee8fcb6b9d5f724ecb
parent85729e693ecb75e32284df7f47880b3b57eadcde
Merge branch 'master' of orgmode.org:org-mode