Merge branch 'master' of ssh://repo.or.cz/srv/git/planner-el
authorJohn Sullivan <johnsu01@wjsullivan.net>
Sun, 18 May 2008 18:08:53 +0000 (14:08 -0400)
committerJohn Sullivan <johnsu01@wjsullivan.net>
Sun, 18 May 2008 18:08:53 +0000 (14:08 -0400)
commit2978fce17d7ccabfdbcc3454656c33e7aa97f4ce
treebcc7a260c74baec5ad718c70295f1a0bcdfbde49
parent0396b33a74312d290e68b1a3e6bac1944501ca2a
parent346a996c2f8b21232f484468e46230b4c8f92c50
Merge branch 'master' of ssh://repo.or.cz/srv/git/planner-el

Conflicts:

ChangeLog
Makefile.defs.default
ChangeLog
Makefile.defs.default
planner.el