Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit6b9782d3f610265bfdcda7c6bb406703ee7f8e0a
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 14 Oct 2010 12:18:38 +0000 (14 14:18 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 14 Oct 2010 12:18:38 +0000 (14 14:18 +0200)
tree4e42322d915a5f7e6452cbf9342f5b85229dfe13
parent6cd6028b1a895043634c97e6bf5d89aea885397e
parentedaa4d7a6f37b02095a8c19762bc00a0f8e83005
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode