Merge plan for 1.4 -> 1.5

[Corey Nolet]

Hey Guys,

Can anyone describe the current merge plan for dealing with the directory
changes between 1.4 and 1.5? There are already slight differences in my
patches between these versions.


Thanks!