Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit17c7786bb0fa596ca66a5d1b77022745918f659f
authorDavid Maus <dmaus@ictsoc.de>
Mon, 23 Aug 2010 17:35:52 +0000 (23 19:35 +0200)
committerDavid Maus <dmaus@ictsoc.de>
Mon, 23 Aug 2010 17:35:52 +0000 (23 19:35 +0200)
tree0b008ee7496ff7c39613c3ba8df55cdf799a6111
parent9e6391389cc196cb121647c6497c7bffd8806a56
parent550278c13550237711a66c89696b71c8b9d04632
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode