Merge commit '741d353ab9cb47fe864e60552bf7b9af7aaa735b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:17:59 +0000 (14:17 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:17:59 +0000 (14:17 +0200)
* commit '741d353ab9cb47fe864e60552bf7b9af7aaa735b':
  huffman: allow specifying nb_bits to ff_huff_build_tree()

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

Trivial merge