IN/OUT administrator  'merge anibal:angel' - ref BT#8566

Commits merges (angel, anibal)
Bad indentation!