Merge tag 'upstream/1.1.4'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 3 Jun 2016 12:06:54 +0000 (14:06 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 3 Jun 2016 12:06:54 +0000 (14:06 +0200)
commitd9faf40c40a26a23d26eac96ef7c28efec46e133
tree4b1106dcfd9d9bea4352ff87ba2645f81b0f0a77
parentfd5d0b5878faa257f0f994113a56fdba06a93de1
parent0deb9e4d02edca6136a3c519f19c71ffc4d462d3
Merge tag 'upstream/1.1.4'

Upstream version 1.1.4