Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit05893b658dea9c4ef2fcf7aeac72f2d8da0a4efb
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 6 Dec 2010 09:15:32 +0000 (6 10:15 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 6 Dec 2010 09:15:32 +0000 (6 10:15 +0100)
tree9f9eb4b2bd15c1f44b732d3f8d09c97d180f327c
parentade2258e3753db0a14c3481442e1aef912725b44
parente9215698a23b86bb77d03ba165a0e2160055a8cb
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode