← Back to branch summary

~allanlesage/helipad/kill-jenkinsrun

Viewing all changes in revision 40.

  • Committer: Allan LeSage
  • Date: 2013-08-07 23:19:16 UTC
  • mfrom: (36.2.1 ci)
  • Revision ID: allan.lesage@canonical.com-20130807231916-e9zw3839nkkbxkww
Merge trunk, resolving migration conflict.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: