Merge commit '99aeae20de4d09ea313fdc619d4e2df825155e62'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:06:37 +0000 (13:06 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:06:37 +0000 (13:06 +0100)
commit99c9e00c685d4fb9e991b8b24aa4818c19173cff
tree5f7f516d565585419d21c31839b00552f5375404
parent9da2b376683b36afd846d83deca13e3df3c11f95
parent99aeae20de4d09ea313fdc619d4e2df825155e62
Merge commit '99aeae20de4d09ea313fdc619d4e2df825155e62'

* commit '99aeae20de4d09ea313fdc619d4e2df825155e62':
  scale_npp: fix passthrough mode

This commit is a noop, see f524275ef93882f27c0067e85e8fb3c0fc1a762b

Merged-by: Clément Bœsch <u@pkh.me>