Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit12e58f484450f1a062ae26ac76abb0694df1dc50
authorEric Schulte <schulte.eric@gmail.com>
Mon, 20 Sep 2010 14:38:09 +0000 (20 08:38 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Mon, 20 Sep 2010 14:38:09 +0000 (20 08:38 -0600)
tree2617689c9a1bd80a086fa8a45725b637fc753fde
parent88b8b839511ebec20388108c98853588addb6fa7
parentd1a5ddbc7e906276d0e036345ac000d4e7d99d57
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode