Commit 9f9079c3 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents 2e6a51a4 699e8268
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