Merge branch 'master' of orgmode.org:org-mode
commit164367fbbe8393fcbcbfa3fc2d6b4a8373e41e9e
authorBastien Guerry <bzg@altern.org>
Sat, 19 Feb 2011 11:13:56 +0000 (19 12:13 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 19 Feb 2011 11:13:56 +0000 (19 12:13 +0100)
treefeeea318bab5e15bfee0487d1f5bbe1886b7689e
parent3655dcbd371cfcb43b4fa48ec7769bda116cbd98
parent729564ae749a0101454604bf3c24afda6dcb9379
Merge branch 'master' of orgmode.org:org-mode