Commit 139739cc authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.5.x' into 2.0.x

parents 3e82e7aa 23d99982
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
https://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
......
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