Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 19:47:42 +0000 (21:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 20:03:13 +0000 (22:03 +0200)
commit7f53f1136346c83093219b260d5c95461f64193e
tree45f8e609a60d6e39fdff94442ebfdf9af2d06ce0
parent3d93ba562243b6d8afac3c875c05304d41da94bf
parent42eb9154a83e9a7aedb1168b2f1112af765cf2b5
Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'

* commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5':
  fate: support testing of release branches

Conflicts:
tests/fate.sh

The communication protocol is left at version 0 as our fate server
hasnt been updated to support this yet

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