merged

diff --cc .gitignore
index 53954d2,e442fbf..b5335c8
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,6 +1,7 @@@
  .*.sw?
  \.DS_Store
  .prove
 +tmp/
+ local/
+ cpanfile
+ cpanfile.snapshot

diff --cc Changes
index a171d46,a171d46..c17ec7d
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -2,6 -2,6 +2,9 @@@ Revision history for DBIx-Class-Fixture
  
  {{$NEXT}}
  
++- use Test::TempDir::Tiny for better test parallelization and cleanup
++
++
  1.001_029 2015-01-14 15:17:28+00:00 Europe/London
  
  - fix for bugtracker pointing to gh, should be rt, added test to identify windows issues

diff --cc t/lib/DBICTest.pm
Simple merge