Merge tag 'upstream/1.1.5'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 6 Jun 2016 14:37:31 +0000 (16:37 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 6 Jun 2016 14:37:31 +0000 (16:37 +0200)
commitcf12deca248d26a9577c634c9f37703c74f7358f
tree4b75d0567c58239dd98dc4f6688937b436f86dc7
parent3a88e1d31d106fd5b95e7365d6ef6ad33a269631
parent48da1ac5531838d157762882ee455cec4da05728
Merge tag 'upstream/1.1.5'

Upstream version 1.1.5