Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 02:02:04 +0000 (03:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 02:02:09 +0000 (03:02 +0100)
commit4155f2d7cc6a6413bbc6c40741e4d07e6612cac5
tree694baab0981bed509075db1519ce43adc11cdb68
parent6ad749b5335444e5ca2223997d2ab2a215363327
parent3ea97767e49c599813d6a09c640a657d71c1a0de
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add an ARES atom to extradata when encoding avui.

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