Merge lp:~ps-jenkins/libcolumbus/latestsnapshot-1.0.0+13.10.20130814-0ubuntu1 into lp:libcolumbus

[PS Jenkins bot]

Releasing 1.0.0+13.10.20130814-0ubuntu1 (revision 452 from lp:libcolumbus)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
Build was skipped, merge only
Executed test runs:

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:453
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libcolumbus-ci/16/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

453. By PS Jenkins bot on 2013-08-14

Releasing 1.0.0+13.10.20130814-0ubuntu1, based on r452

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-14 12:20:15 +0000
+++ debian/changelog	2013-08-14 13:12:54 +0000
@@ -1,8 +1,16 @@
-libcolumbus (1.0.0daily13.08.09-0ubuntu1) UNRELEASED; urgency=low
+libcolumbus (1.0.0+13.10.20130814-0ubuntu1) saucy; urgency=low
 
+<<<<<<< TREE
   * Release new upstream version, bump to ABI 1
-
- -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 09 Aug 2013 10:31:48 -0400
+=======
+  [ Mathieu Trudel-Lapierre ]
+  * 
+>>>>>>> MERGE-SOURCE
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 452
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 14 Aug 2013 10:09:26 +0000
 
 libcolumbus (0.5.0daily13.06.06-0ubuntu1) saucy; urgency=low