Merge lp:~ps-jenkins/account-plugins/latestsnapshot-0.11+13.10.20140414.2-0ubuntu1 into lp:account-plugins/13.10

[PS Jenkins bot]

Releasing 0.11+13.10.20140414.2-0ubuntu1 (revision 133 from lp:account-plugins/13.10)

Unmerged revisions

134. By PS Jenkins bot on 2014-04-14

Releasing 0.11+13.10.20140414.2-0ubuntu1, based on r133

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-14 21:05:27 +0000
+++ debian/changelog	2014-04-19 20:53:39 +0000
@@ -1,4 +1,21 @@
+<<<<<<< TREE
 account-plugins (0.11+13.10.20140414.1-0ubuntu1) saucy; urgency=low
+=======
+account-plugins (0.11+13.10.20140414.2-0ubuntu1) saucy; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Robert Bruce Park ]
+  * Revert erroneous maintscript creation.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 133
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 14 Apr 2014 20:26:36 +0000
+
+account-plugins (0.11+13.10.20140414-0ubuntu1) saucy; urgency=low
+>>>>>>> MERGE-SOURCE
 
   [ Alberto Mardegan ]
   * Use new Canonical-owned facebook application key (LP: #1304798)