Merge branch 'master' into dct
authorPaul Brossier <piem@piem.org>
Tue, 3 Oct 2017 20:31:12 +0000 (22:31 +0200)
committerPaul Brossier <piem@piem.org>
Tue, 3 Oct 2017 20:31:12 +0000 (22:31 +0200)
commitbfbfafa5cb3c42aa2eb201a5db3656a5232554ff
treecbe8767adc1acc18c15dd7fecf1e8ede9e3e9850
parent7b7a58e087d43e0586b52412034bc6fd87e60f71
parent25db68c4eefe354f18c58a47eeb5643fc534eb81
Merge branch 'master' into dct