Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commite073db2a3e5a010aa163a4d3330f451ffe86aa9d
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 18 Feb 2009 07:12:12 +0000 (18 08:12 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 18 Feb 2009 07:12:12 +0000 (18 08:12 +0100)
treee44f2eb1502b9c9e0938c74e103d63f9d8935267
parent113bec9eeb9b4fc18ffe6d36c2eb4df8f342d030
parent54adaa4f9fbfb9583cd759ad0a58a71615bfd217
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:
lisp/ChangeLog