Merge trunk.
authorThomi Richards <thomi.richards@canonical.com>
Sun, 24 Nov 2013 22:57:44 +0000 (11:57 +1300)
committerThomi Richards <thomi.richards@canonical.com>
Sun, 24 Nov 2013 22:57:44 +0000 (11:57 +1300)
1  2 
NEWS
python/subunit/tests/__init__.py

diff --cc NEWS
Simple merge
Simple merge