Merge commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Jan 2015 10:55:53 +0000 (11:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Jan 2015 10:55:56 +0000 (11:55 +0100)
commit526f7ef2110811f3b8d116e80ef29cae3b30bc2d
tree161c2708537f3cd8193ec0865897c39ead9adae6
parent89684883af44bfa04560ce0864d8633d915c2480
parent1d8aa23794cc63e9517d5055a2d48040b843b1cf
Merge commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf'

* commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf':
  dashenc: Fix format string generation

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