Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit088a9ae0caa4e5e59622777bb6ac55f2fb56ed2f
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 3 Jan 2011 11:36:42 +0000 (3 12:36 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 3 Jan 2011 11:36:42 +0000 (3 12:36 +0100)
tree05cb4c9aca47557e930d2214f70d9650f9865f8d
parent5de5fa3eb2dfc90be8a9b487d34c7aa4bab89a84
parent3b640634686ffa1faa8f2dc8f45be10fef08e346
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode