Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit25278ae6b940a941da4b0c331fe434ce2272fca8
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 3 Apr 2010 18:26:56 +0000 (3 20:26 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 3 Apr 2010 18:26:56 +0000 (3 20:26 +0200)
tree00d7a2dfcf80260a5b6fff7513f06cdafe067d0e
parentd041e78c305841c0b908df128db0ff40b7070111
parent420fa914eda7e98b4fc36cfa3b42131f4a4c9286
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode