~allenap/maas-test/configure-abstract

Viewing all changes in revision 75.

  • Committer: Gavin Panella
  • Date: 2013-11-27 17:50:44 UTC
  • mfrom: (39.1.37 maas-test)
  • Revision ID: gavin.panella@canonical.com-20131127175044-ga1j0ua576f8prqz
Merge trunk, resolving conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: