Merge branch 'master' of orgmode.org:org-mode
commit4e0fe88f7e23f89e5b1cb0440b819baec7e33524
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 31 Dec 2011 14:24:14 +0000 (31 15:24 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 31 Dec 2011 14:24:14 +0000 (31 15:24 +0100)
treed4328a804e9daceab8c580ab7ee18f99e4982f63
parent23bdbffb4ced8aaac96d85a7da7f4c730cf8d15e
parent112d1281802b0e4877b240d868c3b6c0a502fe65
Merge branch 'master' of orgmode.org:org-mode
lisp/org-agenda.el
lisp/org.el