Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit96e02e33125c09d6715d050dd8fb198645b8b076
authorBastien Guerry <bzg@altern.org>
Fri, 14 Mar 2008 12:43:25 +0000 (14 12:43 +0000)
committerBastien Guerry <bzg@altern.org>
Fri, 14 Mar 2008 12:43:25 +0000 (14 12:43 +0000)
treee5a77ee672b42806f770bebfab276f7eaede8d7e
parent103af6eddd9d7346da5951775435d0616cc869fe
parent666448ddf304ebbe1ee8b25f7b1404f6fa19c543
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode