Merge commit '98c9ade9853a9c413534ef243174d65f3f7506fa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 5 Aug 2015 10:18:31 +0000 (12:18 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 5 Aug 2015 10:18:31 +0000 (12:18 +0200)
* commit '98c9ade9853a9c413534ef243174d65f3f7506fa':
  drawtext: Move the strftime expansion in a separate function

Not merged, the code does not exist anymore.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge