Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitb9aee58af3d5eab4ed7da06501f3e590475fdfc6
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 7 Jul 2010 21:43:53 +0000 (7 23:43 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 7 Jul 2010 21:43:53 +0000 (7 23:43 +0200)
tree4d72d547be61b83190648ee07d7d5d98a911830a
parentdf248db7d9297baefd724f571ccb7331f584c928
parent869082e5fdefd8e00146e35a335e47d5dc1f526c
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode