Merge branch 'master' into dct
authorPaul Brossier <piem@piem.org>
Sat, 16 Sep 2017 21:55:51 +0000 (23:55 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 16 Sep 2017 21:55:51 +0000 (23:55 +0200)
commit7b7a58e087d43e0586b52412034bc6fd87e60f71
tree39e66b0bae81ff08343b9168b6f07f865fbac48d
parentb99e2a51435c08e7caf437fe05f14b9da1c39b53
parentcfb7fb7bf50e9b25e486d0d9a5c1cc75f1d4055d
Merge branch 'master' into dct