Merge lp:~ps-jenkins/ubuntu-app-launch/latestsnapshot-0.1+13.10.20131008.1-0ubuntu1 into lp:ubuntu-app-launch/13.10

[PS Jenkins bot]

Releasing 0.1+13.10.20131008.1-0ubuntu1 (revision 73 from lp:upstart-app-launch)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-08 19:38:15 +0000
+++ debian/changelog	2013-10-08 23:58:22 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 upstart-app-launch (0.2-0ubuntu1) UNRELEASED; urgency=low
 
   * Bumping to version 0.2
@@ -5,6 +6,23 @@
 
  -- Ted Gould <[e-mail]>  Tue, 08 Oct 2013 14:37:31 -0500
 
+=======
+upstart-app-launch (0.1+13.10.20131008.1-0ubuntu1) saucy; urgency=low
+
+  [ Ted Gould ]
+  * On second activations send a message to the FD.o application
+    interface. (LP: #1228345)
+  * Add observers for focused and resume.
+  * Testing of the second exec logic.
+  * Disable ZG logging for Phone 1.0.
+  * Need a little longer time on recent ARM builds.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 73
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 08 Oct 2013 10:07:25 +0000
+
+>>>>>>> MERGE-SOURCE
 upstart-app-launch (0.1+13.10.20130925.2-0ubuntu1) saucy; urgency=low
 
   [ Ted Gould ]