Merge branch 'master' of orgmode.org:org-mode
commit0dc16a0fe9179fb1be58a989d7a463b8563046ce
authorBastien Guerry <bzg@altern.org>
Tue, 15 Mar 2011 17:36:22 +0000 (15 18:36 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 15 Mar 2011 17:36:22 +0000 (15 18:36 +0100)
tree727837af23204b29abb25dfaf2e93cc748d357ec
parent76a8c2bb17fb02cc5a9f9df050e2ca7ef80c6f6d
parentcf076fd65483f551d04902f9a0b3947f4e87f358
Merge branch 'master' of orgmode.org:org-mode