Merge branch 'develop' into awhitening
authorPaul Brossier <piem@piem.org>
Thu, 13 Aug 2015 13:31:06 +0000 (15:31 +0200)
committerPaul Brossier <piem@piem.org>
Thu, 13 Aug 2015 13:31:06 +0000 (15:31 +0200)
commit299dbfdf40937b4e14be5bc7e9aacdcd7b44e888
tree9f5586a5439f89226626cf82bf9bfddd22bc8cec
parent9f060d11650a940dba7dfacc9b933b92802cdb04
parent7b2d7402b3a3660d4ed2b32ae5378230ab5058fe
Merge branch 'develop' into awhitening