Merge branch 'split-out-org-faces.el'
commit84432821a5515cc5cdd9144f2dc9fec9ddfc432e
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 9 Apr 2008 13:45:00 +0000 (9 15:45 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 9 Apr 2008 13:45:00 +0000 (9 15:45 +0200)
tree72fd22c8f21d020dedca38b69f22febc7fa303c5
parent3721171a53c72597085ee3245c54e7d9c1fb0bd1
parent1b58b6ba9ff752419f7ca2eff5cd6abab74b7c6f
Merge branch 'split-out-org-faces.el'

Conflicts:

ChangeLog
ChangeLog