Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 12:23:46 +0000 (14:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 12:23:46 +0000 (14:23 +0200)
commitfac292b8cd4b1374471f0ab2900cdd242de3d1ef
treeddbf78c493a4f446a048ff3d670f36d1c96bb699
parent491c52d3b077dc1f298322a719059398a5f76af8
parent23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac
Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'

* commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac':
  fate: explicitly set the default THREADS value

Conflicts:
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/Makefile