Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commite2ea50ebe9b57e10caccafe6000848a374c66bd3
authorDavid Maus <dmaus@ictsoc.de>
Mon, 29 Nov 2010 20:04:50 +0000 (29 21:04 +0100)
committerDavid Maus <dmaus@ictsoc.de>
Mon, 29 Nov 2010 20:04:50 +0000 (29 21:04 +0100)
tree74ffbc7a8d629140b185c3f1bee4f7da4cb18604
parent1b5ff1e341efbb34c275c48f99ef5b7169c1b494
parent12b153ed8be2f1c67a957e31555c46c5c4e78a1c
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode