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

Merge branch '1.5.x'

parents ae0700ef 992caa2e
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