[FFmpeg-cvslog] Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 14:21:39 2013 +0200| [63208c034bf660ed7f15bf09fdd4c813a6e6bf7a] | committer: Michael Niedermayer

Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77'

* commit 'bd392785a75d7d51414a9788d50396a8d9f29d77':
  fate-run: Drop unnecessary regtest() indirection

Conflicts:
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63208c034bf660ed7f15bf09fdd4c813a6e6bf7a
---