Merge commit '29b3ca743dd02efbe00565c0b997e735e4daa772' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:02:06 +0000 (14:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:02:06 +0000 (14:02 +0200)
* commit '29b3ca743dd02efbe00565c0b997e735e4daa772':
  drawtext: Drop pointless header

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

Trivial merge