Merge tag 'upstream/1.1.5'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 6 Jun 2016 09:58:17 +0000 (11:58 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 6 Jun 2016 09:58:17 +0000 (11:58 +0200)
commit9490f614e45481667b812c93497eb08c72921894
treed9b408185bd92df29009f48318e02ac4901150b8
parente7dc97f65bb3c901385f575bce767f1180ec43d8
parent272829dad430c7b3fc6d523d2521cf11409473d5
Merge tag 'upstream/1.1.5'

Upstream version 1.1.5