Merge branch 'develop' into accelerate
authorPaul Brossier <piem@piem.org>
Sat, 5 Sep 2015 09:55:53 +0000 (11:55 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 5 Sep 2015 09:55:53 +0000 (11:55 +0200)
commit0969113110f96081523419ccde6ac0e8616e8eeb
tree9fb9b61119ff517b47a1cb9a4b0fd03c93e82ce5
parentc9e3a4ec8da543f3309b4ee9377253f5279d8288
parentf8340e1cf44061891b4d45d8c835bd140ee46318
Merge branch 'develop' into accelerate