Merge branch 'dev' of github.com:Cyan4973/lz4 into dev
authorYann Collet <yann.collet.73@gmail.com>
Fri, 15 Jan 2016 15:41:27 +0000 (16:41 +0100)
committerYann Collet <yann.collet.73@gmail.com>
Fri, 15 Jan 2016 15:41:27 +0000 (16:41 +0100)

Trivial merge