Merge branch 'master' into awhitening
authorPaul Brossier <piem@piem.org>
Sun, 26 Mar 2017 15:49:46 +0000 (17:49 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 26 Mar 2017 15:49:46 +0000 (17:49 +0200)
commitb31a91c1c720445de742fd039b7ba491011b3e65
tree6c922d74d681331dad7006097778c1f8e2fcc45e
parentbd973b052ad95d0c611a05d336e43831a52799cd
parentb39a6766db3ba13ec092c65eb2a5d4203c635591
Merge branch 'master' into awhitening