Merge branch 'debian/mitaka' of ssh://git.debian.org/git/openstack/python-os-testr into debian/mitaka

Conflicts:
	debian/changelog
	debian/control

debian/changelog

@@ -1,6 +1,11 @@
 python-os-testr (0.4.2-1) experimental; urgency=medium
 
+  [ Thomas Goirand ]
   * New upstream release.
+  * Fixed (build-)depends for this release.
+
+  [ Corey Bryant ]
+  * d/control: Update uploaders.
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 02 Dec 2015 15:07:37 +0100
 

debian/control

@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
 Uploaders: James Page <james.page@ubuntu.com>,
            Thomas Goirand <zigo@debian.org>,
+           Corey Bryant <corey.bryant@canonical.com>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                openstack-pkg-tools,