For some reason Launchpad is not showing all of the revisions that this merge will incorporate; the full set of commits on this branch goes back to revno 12104 inclusive. The diff below is also a bit confused by the 3.15 source tree reorganization, but if you ignore the embedded conflict markers it does seem to show all of the changes.
For some reason Launchpad is not showing all of the revisions that this merge will incorporate; the full set of commits on this branch goes back to revno 12104 inclusive. The diff below is also a bit confused by the 3.15 source tree reorganization, but if you ignore the embedded conflict markers it does seem to show all of the changes.