Merged trunk, fixed conflict.
authorThomi Richards <thomi.richards@canonical.com>
Mon, 2 Dec 2013 05:21:08 +0000 (18:21 +1300)
committerThomi Richards <thomi.richards@canonical.com>
Mon, 2 Dec 2013 05:21:08 +0000 (18:21 +1300)
1  2 
Makefile.am
NEWS
setup.py

diff --cc Makefile.am
Simple merge
diff --cc NEWS
Simple merge
diff --cc setup.py
+++ b/setup.py
@@@ -10,8 -10,7 +10,8 @@@ else
      extra = {
          'install_requires': [
              'extras',
-             'testtools>=0.9.30',
 +            'testscenarios',
+             'testtools>=0.9.34',
          ]
      }