Merge branch 'master' into yinfft+ yinfft+
authorPaul Brossier <piem@piem.org>
Thu, 2 Feb 2017 01:39:25 +0000 (02:39 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 2 Feb 2017 01:39:25 +0000 (02:39 +0100)
commit5bdbb83a7cbef3a3085df424564fbc6bae1baba4
treeb649156978ff6e4654fcb2f3ae4886f4274ded06
parent422a2a9314055bc13f42f4d6ad9e330417a15b62
parentf98063b27bf9014142bfaae0e7a63a1d5cd49cae
Merge branch 'master' into yinfft+