Merge remote-tracking branch 'origin/1.8'
authorOlivier Goffart <ogoffart@woboq.com>
Mon, 20 Apr 2015 12:58:45 +0000 (14:58 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Mon, 20 Apr 2015 12:58:45 +0000 (14:58 +0200)
commitcf5100a20bdff13ee4fb28e15421f221e9a4e456
treec4f3dde2078f08d4cbd10fc99636f9ce78904931
parentffbf2fb6ced690260bbc24d561b141fcb020fbf6
parentb039c2ce869965f63a5468f3140c422ca1ddf9aa
Merge remote-tracking branch 'origin/1.8'