Merge branches 'master' and 'master' of orgmode.org:org-mode
commit2deac0b0727be7f14dc7a8bce85ce452821299aa
authorBastien Guerry <bzg@altern.org>
Mon, 12 Dec 2011 16:14:25 +0000 (12 17:14 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 12 Dec 2011 16:14:25 +0000 (12 17:14 +0100)
treeb9961cc399721197e709884288a2862c607d91db
parent701830d5a2681ba0ff2e5112fbd4279eb958801a
parent48b8d633c49cf2381665c84c026dcb8c85d972ee
Merge branches 'master' and 'master' of orgmode.org:org-mode