"merged" the automatic_deployments branch into trunk.
Note that had extreme difficulty doing this no doubt because this is probably not "true" svn.