Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commita8e9a52dfc43c6ef79bcba5603858d28b0683cf2
authorDan Davison <davison@stats.ox.ac.uk>
Thu, 23 Sep 2010 18:09:35 +0000 (23 19:09 +0100)
committerDan Davison <davison@stats.ox.ac.uk>
Thu, 23 Sep 2010 18:09:35 +0000 (23 19:09 +0100)
treeff1d7f98daec1f7186273e67c5badfbd819e564f
parentd398331b3ff2a119d1f4dd08907aed1bc8166255
parent59cb09f34cd27f5168eb97ab902f509dd532b9fc
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode