Commit fb371980 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.5.x'

parents a983a4ae c99d1dae
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