Merge branch 'dev' of github.com:Cyan4973/lz4 into dev
authorYann Collet <yann.collet.73@gmail.com>
Fri, 15 May 2015 12:51:13 +0000 (14:51 +0200)
committerYann Collet <yann.collet.73@gmail.com>
Fri, 15 May 2015 12:51:13 +0000 (14:51 +0200)

Trivial merge