Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
authorPrzemyslaw Skibinski <inikep@gmail.com>
Wed, 16 Nov 2016 15:21:20 +0000 (16:21 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Wed, 16 Nov 2016 15:21:20 +0000 (16:21 +0100)
commitb1519f861c56db7623b23151dd986fef96f069c9
tree3cd6d93f92a261e3db26ea2aa400440d9f42aa10
parent2dee7bdaf6710f15d7128273014f3d42d0b7afaa
parent00fa1b9c018cf7dc80a07a1192555469577c675c
Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev

# Conflicts:
# appveyor.yml