pioneerspacesim/pioneer — pull request #1359 by johnbartholomew (2012-07-13 01:08:18+00:00)
Title: Fix search order to prioritise mods, and a latent FileSystem bug

For #1356.

Latent FileSystem bug was that directory entries from FileSourceZip could have trailing slashes, which broke the union merge algorithm (which is purely a text merge with no knowledge of path semantics).