Commit 4edd1aea authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents b6e8a280 3d97ffda
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