Manually restore merge info that got lost in a previous commit

This commit is contained in:
ryounes 2011-07-25 20:16:00 +00:00
parent bd890d4e53
commit c46809198a

Diff content is not available