Merge commit '156bc0193bd47d3f4b3adaa93be0e206e12686ab'
authorJames Almer <jamrial@gmail.com>
Mon, 2 Oct 2017 18:52:18 +0000 (15:52 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 2 Oct 2017 18:52:39 +0000 (15:52 -0300)
commitff29db4ebf2245a33e184d79ebb294c71d42ea1f
treed20e44c736e3e31b7ccf18876506a9b19c9767cb
parent45121cbdda00627c9b51b3fd10ea044ebfaa6664
parent156bc0193bd47d3f4b3adaa93be0e206e12686ab
Merge commit '156bc0193bd47d3f4b3adaa93be0e206e12686ab'

* commit '156bc0193bd47d3f4b3adaa93be0e206e12686ab':
  fate: Add webp alpha test

This commit is a noop, see
bd2cec7021a0e275d4551a56d0a220ba2f9bd691
2bdb26b4eeec8142c927645a10b7f55cae5cdcc5
92bf87db294c0544168f572ba6739db7d2ba2ba3

Merged-by: James Almer <jamrial@gmail.com>