~allenap/maas-test/configure-abstract

Viewing all changes in revision 76.

  • Committer: Gavin Panella
  • Date: 2013-11-28 15:34:02 UTC
  • mfrom: (39.1.38 maas-test)
  • Revision ID: gavin.panella@canonical.com-20131128153402-xyfl8n0p84kp7dtg
Merge trunk, resolving conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: