Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit0479242349b47b4dfde8d9cf1424adf027f4177e
authorEric Schulte <schulte.eric@gmail.com>
Sat, 10 Jul 2010 00:00:22 +0000 (9 17:00 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Sat, 10 Jul 2010 00:00:22 +0000 (9 17:00 -0700)
tree31ac965755f07a0267155dc51fd613d389915fa5
parentc4912669a64d785b4932df471d1a79fa09640deb
parentc76eda31ee861044987d3e35ced42bf2e43613f3
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode