Merge lp:~noskcaj/aisleriot/3.14.2 into lp:~ubuntu-desktop/aisleriot/ubuntu

[Jackson Doak]

new upstream release

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-26 20:43:03 +0000
+++ debian/changelog	2014-11-15 23:38:10 +0000
@@ -1,3 +1,9 @@
+aisleriot (1:3.14.2-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+
+ -- Jackson Doak <[e-mail]>  Sun, 16 Nov 2014 09:16:29 +1100
+
 aisleriot (1:3.14.1-1ubuntu1) vivid; urgency=medium
 
   * Merge from debian (LP: #1385745). Remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2014-10-26 20:43:03 +0000
+++ debian/control	2014-11-15 23:38:10 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Josselin Mouette <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Jordi Mallach <[e-mail]>, Michael Biebl <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: cdbs,
                debhelper (>= 8),
                dh-autoreconf,