Re: Issue with merging release with trunk

[Justin Mclean]

Hi,

> Did you revert the trunk checkins that shouldn't have been checked in?

No just overrode anything in conflict with the release version, everything 
should of been in develop/release anyway. (ie same changes checked in twice)

Justin