Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit10600c55ee2d88a2ef976cf36bbf532db55a75a0
authorEric Schulte <schulte.eric@gmail.com>
Wed, 7 Jul 2010 22:46:35 +0000 (7 15:46 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Wed, 7 Jul 2010 22:46:35 +0000 (7 15:46 -0700)
treeab5bad7f0016683335ed553f8137de0c4c61854e
parentfabf73b060684f99ed26a9a6babdcc32ac0d338c
parentb9aee58af3d5eab4ed7da06501f3e590475fdfc6
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode