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

Conflicts:
	debian/changelog
	debian/control

debian/changelog

@@ -1,8 +1,12 @@
 python-tempest-lib (0.11.0-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:22:51 +0100
 
 python-tempest-lib (0.9.0-3) unstable; urgency=medium

debian/control

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