Merge branch 'master' of orgmode.org:org-mode
commit29c106f5e83baf81830d6f10591bd337fd82b3e6
authorBastien Guerry <bzg@altern.org>
Mon, 31 Jan 2011 19:43:26 +0000 (31 20:43 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 31 Jan 2011 19:43:26 +0000 (31 20:43 +0100)
treec6b60cb813c59591c2d293014033b42679292214
parente4bbefeef6d307ad40b71dc28d0b1b92a99b0148
parentc59c8346af255720084767f30f963602f70c60f2
Merge branch 'master' of orgmode.org:org-mode