Merge branch 'master' of orgmode.org:org-mode
commit21e08e56435748e3e06759b1d652090601980d3f
authorBastien Guerry <bzg@altern.org>
Sun, 3 Jul 2011 11:00:24 +0000 (3 13:00 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 3 Jul 2011 11:00:24 +0000 (3 13:00 +0200)
treee35da0e4b23af22ff1677110fafeeb53e7abd900
parent75fcdda72cc9e93bf908d84b90ed357f01781b88
parenteaa724404b5d5eb4e989b5736c65148875960d3d
Merge branch 'master' of orgmode.org:org-mode