Merge branch 'master' of orgmode.org:org-mode
commitd2871b007b8a9513a8e64aff4bb3fb21654fd4db
authorBastien Guerry <bzg@altern.org>
Sat, 13 Aug 2011 08:11:59 +0000 (13 10:11 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 13 Aug 2011 08:11:59 +0000 (13 10:11 +0200)
tree866f11b1372996f0d75bdab4418e039f3834ec5b
parent92b87288c7ccf7221d59f4319d5ffa05903ee8e7
parente5199c4095fd9139e75bb32e2f61a4f6db0a8eaa
Merge branch 'master' of orgmode.org:org-mode