Merge remote-tracking branch into 1.8
authorOlivier Goffart <ogoffart@woboq.com>
Tue, 7 Apr 2015 08:42:27 +0000 (10:42 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Tue, 7 Apr 2015 08:42:27 +0000 (10:42 +0200)
commite15b9b5358961a3a23bb117330132725a77c9353
tree86207b4dc35f4d1d18715fa5e928d9dfc6624fc0
parent16600fe86a869fbeebb17790d0a22babae982e80
parent1617c9d482527c6f38f1567a31e5d5d766451f5e
Merge remote-tracking branch into 1.8