Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit4b018804300cec3eea8c8b2803f29d6e932b3ee6
authorBastien Guerry <bzg@altern.org>
Sun, 5 Sep 2010 19:10:06 +0000 (5 21:10 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 5 Sep 2010 19:10:06 +0000 (5 21:10 +0200)
tree9557bac0e3753e970f429125c55695b37e955dd1
parent3ec475027162b6f42c33dfd8ccbacc1a07071e87
parent1a34708ade9934ec303f02e447f124e202b05ff3
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode