Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 20:45:18 +0000 (21:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 20:50:49 +0000 (21:50 +0100)
commita8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69
treea5e6b2cffa6fd65fef129aac095bf33265af6229
parent0460b9bb3e34472223084a6c3ad35b4ded9c276b
parent9510d7689e236f6a4748795604fba427c130d0ad
Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

* commit '9510d7689e236f6a4748795604fba427c130d0ad':
  fate.sh: Allow non-fast-forwards when updating sources

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