Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
authorPrzemyslaw Skibinski <inikep@gmail.com>
Tue, 15 Nov 2016 08:43:59 +0000 (09:43 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Tue, 15 Nov 2016 08:43:59 +0000 (09:43 +0100)

Trivial merge