Merge branch 'master' into timestretch
authorPaul Brossier <piem@piem.org>
Fri, 30 Sep 2016 12:55:31 +0000 (14:55 +0200)
committerPaul Brossier <piem@piem.org>
Fri, 30 Sep 2016 12:55:31 +0000 (14:55 +0200)
commit901ab5928c6caf34e4e4d4ff21372f6bdb80b01c
tree67c60acca93ca9d5205bd85a99c028e0e9fbca1d
parentb19243ee3894cc2e8017cbcdee80e6cbb6a690b7
parentd882e25a3c5dd17afffa0ced126d9867c6c52583
Merge branch 'master' into timestretch