Viewing all changes in revision 345.

Committer: Gavin Panella
Date: 2014-12-05 16:55:24 UTC
mfrom: <a title="Merged From 331.1.1" href="/~allenap/maas/packaging.regiond/revision/331.1.1">(331.1.1 packaging.rename-scripts-and-prepare-for-twistd-in-region)
Revision ID: gavin.panella@canonical.com-20141205165524-i3xf5q4qs9ugkmge

Merged packaging.rename-scripts-and-prepare-for-twistd-in-region into packaging.regiond, resolving a few tricky conflicts.

added added

removed removed

~allenap/maas/packaging.regiond