Fix leftover merge conflicts
commitb3c9fedef0034353a38d43a9d0be56521c9cdf8b
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 2 Jul 2010 05:04:57 +0000 (2 07:04 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 2 Jul 2010 05:04:57 +0000 (2 07:04 +0200)
treedc16b4ffbd285a6b50f3466fded13c00e0741104
parent42f239cb0e97b82f59beae874e67c4afad86409f
Fix leftover merge conflicts
doc/org.texi