Merge lp:~fginther/cupstream2distro-config/vivid-branch-fixes into lp:cupstream2distro-config

[Francis Ginther]

Fix typos in branch names for lp:ubuntuone-credentials/touch-15-04 and lp:unity-scope-click/touch-15-04.

Fix typos in branch names for lp:ubuntuone-credentials/touch-15-04 and lp:unity-scope-click/touch-15-04.

[Paul Larson (pwlars)]

Checked launchpad, confirmed the new names are correct. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'stacks/vivid/click-package.cfg'
--- stacks/vivid/click-package.cfg	2015-05-15 02:25:57 +0000
+++ stacks/vivid/click-package.cfg	2015-05-15 18:26:27 +0000
@@ -19,7 +19,7 @@
       hooks: H05set_package_version H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
       hook_source: lp:~canonical-ci-engineering/+junk/native-strip-hook
       test_suite: unityclickscope
-      target_branch: unity-scope-click/touch-15.04
+      target_branch: lp:unity-scope-click/touch-15-04
   to_transition:
     click:
       autolanding_template: False
 
=== modified file 'stacks/vivid/webcred.cfg'
--- stacks/vivid/webcred.cfg	2015-05-14 22:16:59 +0000
+++ stacks/vivid/webcred.cfg	2015-05-15 18:26:27 +0000
@@ -21,7 +21,7 @@
     account-polld:
       autolanding_template: False
     ubuntuone-credentials:
-      target_branch: lp:ubuntuone-credentials/touch-15.04
+      target_branch: lp:ubuntuone-credentials/touch-15-04
       autolanding_template: False
       hooks: H05set_package_version H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
       hook_source: lp:~canonical-ci-engineering/+junk/native-strip-hook