-
Committer:
Stewart Smith
-
Date:
2012-08-24 06:31:08 UTC
-
mfrom:
(288.2.6 5.5-merge-5.1)
-
Revision ID:
stewart@flamingspork.com-20120824063108-6aloqmrr20whtv7z
merge partial PS 5.1 to PS 5.5 merge. This (essentially) null merges (except for file ids) revisions from PS 5.1 to 5.5. Files that had the same name in 5.1 and 5.5 but different file ids now have the same file id as the 5.1 file, so that future modifications and merges 'just work'