Merge lp:~ahayzen/ubuntu-weather-app/release-3.1 into lp:ubuntu-weather-app

[Andrew Hayzen]

* Release 3.1 and bump version to 3.2

* Release 3.1 and bump version to 3.2

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:185
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/26/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/217/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/26/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

lgtm! Thanks! :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-11 04:02:24 +0000
+++ debian/changelog	2015-12-03 15:33:19 +0000
@@ -1,4 +1,10 @@
-ubuntu-weather-app (3.1ubuntu1) UNRELEASED; urgency=medium
+ubuntu-weather-app (3.2) UNRELEASED; urgency=medium
+
+  * Release 3.1 and bump version to 3.2
+
+ -- Andrew Hayzen <[e-mail]>  Thu, 03 Dec 2015 15:20:49 +0000
+
+ubuntu-weather-app (3.1ubuntu1) vivid; urgency=medium
 
   [ Andrew Hayzen ]
   * Bump version to 3.1
@@ -13,7 +19,7 @@
   [ Victor Thompson ]
   * Create an error state when there are no keys found.
 
- -- Andrew Hayzen <[e-mail]>  Sat, 24 Oct 2015 20:22:31 +0100
+ -- Andrew Hayzen <[e-mail]>  Thu, 03 Dec 2015 15:20:18 +0000
 
 ubuntu-weather-app (3.0ubuntu1) vivid; urgency=medium
 

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-11-02 21:28:34 +0000
+++ manifest.json.in	2015-12-03 15:33:19 +0000
@@ -12,7 +12,7 @@
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "name": "@PROJECT_NAME@",
     "title": "Weather",
-    "version": "3.1.@BZR_REVNO@",
+    "version": "3.2.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",
         "vcs-bzr-revno": "@BZR_REVNO@"