Merge lp:~nik90/ubuntu-clock-app/merge-changelog into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Merged 3.4Ubuntu2 and 3.4 version changelogs.

Just a minor changelog merge.

[Bartosz Kosiorek (gang65)]

Thanks for fixing this.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-24 17:01:38 +0000
+++ debian/changelog	2015-08-01 10:31:50 +0000
@@ -4,9 +4,10 @@
 
  -- Bartosz Kosiorek <[e-mail]>  Fri, 24 Jul 2015 18:05:38 +0200
 
-ubuntu-clock-app (3.4ubuntu2) vivid; urgency=medium
+ubuntu-clock-app (3.4) vivid; urgency=medium
 
-  [ Nekhelesh Ramananthan ]
+  [Nekhelesh Ramananthan]
+  * Updated version to 3.4 to mark transition to vivid framework
   * Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)
   * Migrate to Ubuntu 15.04 SDK Framework and QtQuick 2.4.
   * Migrated add-city, settings, main alarm page to the new list items.
@@ -25,16 +26,6 @@
 
  -- Bartosz Kosiorek <[e-mail]>  Sun, 05 Jul 2015 15:10:12 +0200
 
-ubuntu-clock-app (3.4) vivid; urgency=medium
-
-  [Nekhelesh Ramananthan]
-  * Updated version to 3.4 to mark transition to vivid framework
-
-  [Victor Thompson]
-  * Use city for location if available
-
- -- Nekhelesh Ramananthan <[e-mail]>  Thu, 18 Jun 2015 20:08:59 +0200
-
 ubuntu-clock-app (3.3) utopic; urgency=medium
 
   [Nekhelesh Ramananthan]