Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitffa985a093248b052fad496a43db69fe4a61c5f3
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 25 Aug 2010 10:31:40 +0000 (25 12:31 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 25 Aug 2010 10:31:40 +0000 (25 12:31 +0200)
treef4d617e40365bcf71af6dcaeec391ab39d055975
parent92e491e52c09fa2789ff89c8314d77199c5a87e5
parent5305fe903f6ba3679ec143e9a0fd8c5b01eb2340
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode