Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit02494667c7a55c0c3118d8895f29d16e17076fe3
authorDavid Maus <dmaus@ictsoc.de>
Sun, 21 Nov 2010 18:52:13 +0000 (21 19:52 +0100)
committerDavid Maus <dmaus@ictsoc.de>
Sun, 21 Nov 2010 18:52:13 +0000 (21 19:52 +0100)
tree5c8329c4e789d7b04f165a02d253f4f1bea307b1
parent47486604a47c982d75c6f0b581b572f52c8404e9
parent3ce2488f74829cc491d34ad391a994c144d4c9e2
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode