Merge commit '183880cfc4aae53ce504e13337791cad5841c80c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 10:59:11 +0000 (12:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 11:04:40 +0000 (13:04 +0200)
commit97947d9bba51bb3936a7907fde20c3b242c0d218
treefe0e62c8e326f17ea72a4ea55a4da974bb6a6da2
parente27be795f019a8ba41c33b0cf0e3a060069252ea
parent183880cfc4aae53ce504e13337791cad5841c80c
Merge commit '183880cfc4aae53ce504e13337791cad5841c80c'

* commit '183880cfc4aae53ce504e13337791cad5841c80c':
  pictor: use the correct logging context

No change, as this has already been fixed

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