Merge branch 'master' of orgmode.org:org-mode
commit846ff13247bfde21a8c26dd40be9b5c0b985dcdc
authorBastien Guerry <bzg@altern.org>
Sun, 6 Mar 2011 18:31:46 +0000 (6 19:31 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 6 Mar 2011 18:31:46 +0000 (6 19:31 +0100)
treeda550d4437605e0a4bb667ec5e9c40ceb39c8cc7
parent6a0de0dc7befede91fa244ac4fba1fe73f8a4f2f
parent1a03c5f256cb8daabad83b83780b6115076ad5f5
Merge branch 'master' of orgmode.org:org-mode