Merge lp:~zulcss/python-cinderclient/fixtures into lp:~ubuntu-server-dev/python-cinderclient/grizzly

[Chuck Short]

fixtures and testtools addition to fix a ftbfs.

[Yolanda Robla (yolanda.robla)]

looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-03 13:18:47 +0000
+++ debian/changelog	2013-01-03 13:39:21 +0000
@@ -3,6 +3,7 @@
   [ Chuck Short ]
   * New upstream release.
   * debian/control: Add python-requests as a build dep
+  * debian/control: Add python-testtools and python-fixtures as a build dep.
 
   [ Yolanda Robla ]
   * debian/control: add python-setuptools-git dependency 
 
=== modified file 'debian/control'
--- debian/control	2012-12-29 19:11:32 +0000
+++ debian/control	2013-01-03 13:39:21 +0000
@@ -13,7 +13,9 @@
  pep8,
  python-sphinx,
  python-unittest2,
- python-setuptools-git (>= 0.4)
+ python-setuptools-git (>= 0.4),
+ python-testtools,
+ python-fixtures
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.5