Merge branch 'develop' into awhitening
authorPaul Brossier <piem@piem.org>
Sun, 6 Sep 2015 08:48:24 +0000 (10:48 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 6 Sep 2015 08:48:24 +0000 (10:48 +0200)
commit3d30b90b336477dbdf7618d1ea8115d7c42c434c
tree30a8ba1cedf8211c1870b4ca5c102c77ff022ace
parent695e17128661170168f2143be3cdef38dd1e68fe
parentf0ce36a16a6dfab2f181820447c4707a267f88fb
Merge branch 'develop' into awhitening