Merge branch 'log-rescedule'
commit45191cd220dd75a6cce4c9578624665a0e965955
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 9 Nov 2009 16:34:02 +0000 (9 17:34 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 9 Nov 2009 16:34:02 +0000 (9 17:34 +0100)
tree109f8242d180839826f54304b026a5dceae4dab7
parentcba852789713acf22a6fe054ef9d5c43e5bee107
parenta8ea078c33906001fce056aaba689fe564c7f829
Merge branch 'log-rescedule'

Conflicts:
doc/ChangeLog
doc/ChangeLog
doc/org.texi
lisp/ChangeLog
lisp/org.el