Commit 7a672afc authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents db0758c1 8b832221
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