Commit 068c52b7 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents 7c71fdd9 85ae3082
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment