Merge branch 'improve-customize-type-for-agenda-custom-command'
commitfb8db4d36c126e30a71f7ac276fea46c973ca90d
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 6 Mar 2008 19:13:38 +0000 (6 20:13 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 6 Mar 2008 19:13:38 +0000 (6 20:13 +0100)
tree879c7aaee558ee190f7d1e19e66bf1ebdc7478a2
parent8017cc33d2127f81ec361a37e43136a8a2811c6e
parentb0af4ade44a645584a22cb466268183aff0ac2ac
Merge branch 'improve-customize-type-for-agenda-custom-command'

Conflicts:

ChangeLog
ChangeLog
org.el