we want to have the whole history of changes. The last selective merge and rename caused loss of history of changes. Therefore we have to roll a bit back
rolling back to restore the history of changes
adjusting permissions
minor changes
merging fixes by Pinacolada64, bumping revision
file renamed to reflect the updated revision