Merge branch 'master' into yinfft+
authorPaul Brossier <piem@piem.org>
Wed, 1 Feb 2017 21:54:35 +0000 (22:54 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 1 Feb 2017 21:54:35 +0000 (22:54 +0100)
commita7b14a6f577d56a7f4e2a7a723f3311a1e891844
tree9c1bec88c5eed2820baa90f6686e9f9eb069ba27
parentb4eadf0a26a6e9ae27af809e0748e40e51a9b27e
parentf131ba849aaae809214f5c74c97a69981c361692
Merge branch 'master' into yinfft+