Merge branch 'master' of orgmode.org:org-mode
commit3e06bae09bd89589e3cf7ca66818a39bad106a4f
authorBastien Guerry <bzg@altern.org>
Sun, 6 Mar 2011 20:10:50 +0000 (6 21:10 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 6 Mar 2011 20:10:50 +0000 (6 21:10 +0100)
tree6d864651c71f15902a28d32605caed5b4b29b42a
parent846ff13247bfde21a8c26dd40be9b5c0b985dcdc
parenta93f576033c742beaf81be55254ee98775974ed4
Merge branch 'master' of orgmode.org:org-mode