Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit839a60f310ab9f7b666ec8ff8d6bb6b609b04025
authorEric Schulte <schulte.eric@gmail.com>
Mon, 8 Nov 2010 21:19:39 +0000 (8 14:19 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Mon, 8 Nov 2010 21:19:39 +0000 (8 14:19 -0700)
tree1a27cdc7ccccac83b4ba12b7b059031ee628e0a5
parentc676f6236122dfc84e70fcca585b7040c14276f3
parent6c95170ca0eda739d699f207bcb09528297d8ca1
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode